From da4d0b2bae505ce07198840d99adc0e903d1e6a9 Mon Sep 17 00:00:00 2001 From: Igor Postelnik Date: Tue, 23 Mar 2021 09:30:43 -0500 Subject: [PATCH] TUN-4067: Reformat code for consistent import order, grouping, and fix formatting. Added goimports target to the Makefile to make this easier in the future. --- Makefile | 4 ++ carrier/carrier.go | 6 +-- carrier/websocket.go | 6 +-- cfsetup.yaml | 6 ++- cmd/cloudflared/access/cmd.go | 12 +++--- cmd/cloudflared/app_forward_service.go | 4 +- cmd/cloudflared/app_resolver_service.go | 4 +- cmd/cloudflared/app_service.go | 4 +- cmd/cloudflared/buildinfo/build_info.go | 3 +- cmd/cloudflared/cliutil/deprecated.go | 2 +- cmd/cloudflared/linux_service.go | 6 +-- cmd/cloudflared/macos_service.go | 6 +-- cmd/cloudflared/main.go | 10 ++--- cmd/cloudflared/service_template.go | 2 +- cmd/cloudflared/tunnel/cmd.go | 18 ++++---- cmd/cloudflared/tunnel/configuration.go | 14 +++--- cmd/cloudflared/tunnel/info.go | 3 +- cmd/cloudflared/tunnel/login.go | 2 +- cmd/cloudflared/tunnel/signal.go | 2 +- cmd/cloudflared/tunnel/signal_test.go | 1 - .../tunnel/subcommand_context_teamnet.go | 3 +- .../tunnel/subcommand_context_test.go | 6 +-- cmd/cloudflared/tunnel/subcommands.go | 4 +- cmd/cloudflared/tunnel/subcommands_test.go | 5 ++- cmd/cloudflared/ui/launch_ui.go | 6 +-- cmd/cloudflared/windows_service.go | 7 ++- config/configuration.go | 4 +- config/configuration_test.go | 2 +- config/manager.go | 6 +-- config/manager_test.go | 4 +- connection/connection.go | 3 +- connection/h2mux.go | 8 ++-- connection/h2mux_test.go | 2 +- connection/http2.go | 6 +-- connection/http2_test.go | 9 ++-- connection/metrics.go | 5 ++- connection/observer.go | 4 +- connection/observer_test.go | 5 +-- connection/rpc.go | 6 +-- edgediscovery/edgediscovery.go | 3 +- fmt-check.sh | 14 ++++++ h2mux/muxwriter.go | 3 +- ingress/ingress.go | 6 +-- ingress/ingress_test.go | 2 +- ingress/origin_connection.go | 5 ++- ingress/origin_connection_test.go | 5 ++- ingress/origin_proxy.go | 3 +- ingress/origin_proxy_test.go | 5 ++- ingress/origin_request_config.go | 2 +- ingress/origin_request_config_test.go | 5 ++- ingress/origin_service.go | 7 +-- logger/create_test.go | 31 ++++++------- metrics/timer.go | 43 ++++++++++--------- metrics/timer_test.go | 32 +++++++------- origin/cloudflared.log | 0 origin/metrics.go | 3 +- origin/proxy_test.go | 15 +++---- origin/reconnect.go | 3 +- origin/supervisor.go | 6 +-- origin/tunnel_test.go | 4 +- socks/request_handler.go | 3 +- socks/request_handler_test.go | 3 +- sshgen/sshgen.go | 1 + token/path.go | 2 +- token/shell.go | 1 - token/token.go | 6 +-- token/token_test.go | 16 +++---- tunnelrpc/pogs/auth_outcome.go | 2 +- tunnelrpc/pogs/auth_serialize.go | 4 +- tunnelrpc/pogs/auth_test.go | 3 +- tunnelrpc/pogs/reconnect_tunnel.go | 3 +- tunnelrpc/pogs/support_test.go | 1 - tunnelrpc/pogs/tunnelrpc.go | 4 +- tunnelrpc/pogs/tunnelrpc_test.go | 3 +- tunnelstore/client.go | 3 +- tunnelstore/client_teamnet.go | 3 +- validation/validation.go | 3 +- websocket/websocket.go | 4 +- websocket/websocket_test.go | 8 ++-- 79 files changed, 259 insertions(+), 221 deletions(-) create mode 100755 fmt-check.sh delete mode 100644 origin/cloudflared.log diff --git a/Makefile b/Makefile index ecb7dd81..16fdd9ba 100644 --- a/Makefile +++ b/Makefile @@ -254,3 +254,7 @@ vet: .PHONY: msi msi: cloudflared go-msi make --msi cloudflared.msi --version $(MSI_VERSION) + +.PHONY: goimports +goimports: + for d in $$(go list -mod=readonly -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc) ; do goimports -format-only -local github.com/cloudflare/cloudflared -w $$d ; done diff --git a/carrier/carrier.go b/carrier/carrier.go index f44f5d28..4c90c1e3 100644 --- a/carrier/carrier.go +++ b/carrier/carrier.go @@ -11,11 +11,11 @@ import ( "os" "strings" - "github.com/cloudflare/cloudflared/h2mux" - "github.com/cloudflare/cloudflared/token" - "github.com/pkg/errors" "github.com/rs/zerolog" + + "github.com/cloudflare/cloudflared/h2mux" + "github.com/cloudflare/cloudflared/token" ) const LogFieldOriginURL = "originURL" diff --git a/carrier/websocket.go b/carrier/websocket.go index 4c6d45d1..99313451 100644 --- a/carrier/websocket.go +++ b/carrier/websocket.go @@ -7,13 +7,13 @@ import ( "net/http" "net/http/httputil" + "github.com/gorilla/websocket" + "github.com/rs/zerolog" + "github.com/cloudflare/cloudflared/ingress" "github.com/cloudflare/cloudflared/socks" "github.com/cloudflare/cloudflared/token" cfwebsocket "github.com/cloudflare/cloudflared/websocket" - - "github.com/gorilla/websocket" - "github.com/rs/zerolog" ) // Websocket is used to carry data via WS binary frames over the tunnel from client to the origin diff --git a/cfsetup.yaml b/cfsetup.yaml index b8f7bbf7..e4e4f679 100644 --- a/cfsetup.yaml +++ b/cfsetup.yaml @@ -195,13 +195,15 @@ stretch: &stretch - *pinned_go_fips - build-essential - gotest-to-teamcity + pre-cache: + - go get golang.org/x/tools/cmd/goimports + - go get github.com/BurntSushi/go-sumtype post-cache: - export GOOS=linux - export GOARCH=amd64 - export FIPS=true - # cd to a non-module directory: https://github.com/golang/go/issues/24250 - - (cd / && go get github.com/BurntSushi/go-sumtype) - export PATH="$HOME/go/bin:$PATH" + - ./fmt-check.sh - make test | gotest-to-teamcity component-test: build_dir: *build_dir diff --git a/cmd/cloudflared/access/cmd.go b/cmd/cloudflared/access/cmd.go index 25f8ea8e..81ee4a6d 100644 --- a/cmd/cloudflared/access/cmd.go +++ b/cmd/cloudflared/access/cmd.go @@ -11,6 +11,12 @@ import ( "text/template" "time" + "github.com/getsentry/raven-go" + "github.com/pkg/errors" + "github.com/rs/zerolog" + "github.com/urfave/cli/v2" + "golang.org/x/net/idna" + "github.com/cloudflare/cloudflared/carrier" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/h2mux" @@ -18,12 +24,6 @@ import ( "github.com/cloudflare/cloudflared/sshgen" "github.com/cloudflare/cloudflared/token" "github.com/cloudflare/cloudflared/validation" - - "github.com/getsentry/raven-go" - "github.com/pkg/errors" - "github.com/rs/zerolog" - "github.com/urfave/cli/v2" - "golang.org/x/net/idna" ) const ( diff --git a/cmd/cloudflared/app_forward_service.go b/cmd/cloudflared/app_forward_service.go index 0842c161..1c015430 100644 --- a/cmd/cloudflared/app_forward_service.go +++ b/cmd/cloudflared/app_forward_service.go @@ -1,10 +1,10 @@ package main import ( + "github.com/rs/zerolog" + "github.com/cloudflare/cloudflared/cmd/cloudflared/access" "github.com/cloudflare/cloudflared/config" - - "github.com/rs/zerolog" ) // ForwardServiceType is used to identify what kind of overwatch service this is diff --git a/cmd/cloudflared/app_resolver_service.go b/cmd/cloudflared/app_resolver_service.go index 383eb5e5..e680e307 100644 --- a/cmd/cloudflared/app_resolver_service.go +++ b/cmd/cloudflared/app_resolver_service.go @@ -1,10 +1,10 @@ package main import ( + "github.com/rs/zerolog" + "github.com/cloudflare/cloudflared/config" "github.com/cloudflare/cloudflared/tunneldns" - - "github.com/rs/zerolog" ) const ( diff --git a/cmd/cloudflared/app_service.go b/cmd/cloudflared/app_service.go index 407352c0..7eb0d542 100644 --- a/cmd/cloudflared/app_service.go +++ b/cmd/cloudflared/app_service.go @@ -1,10 +1,10 @@ package main import ( + "github.com/rs/zerolog" + "github.com/cloudflare/cloudflared/config" "github.com/cloudflare/cloudflared/overwatch" - - "github.com/rs/zerolog" ) // AppService is the main service that runs when no command lines flags are passed to cloudflared diff --git a/cmd/cloudflared/buildinfo/build_info.go b/cmd/cloudflared/buildinfo/build_info.go index c818f194..069d3fd8 100644 --- a/cmd/cloudflared/buildinfo/build_info.go +++ b/cmd/cloudflared/buildinfo/build_info.go @@ -1,9 +1,10 @@ package buildinfo import ( - "github.com/rs/zerolog" "fmt" "runtime" + + "github.com/rs/zerolog" ) type BuildInfo struct { diff --git a/cmd/cloudflared/cliutil/deprecated.go b/cmd/cloudflared/cliutil/deprecated.go index 5d31435b..c151378e 100644 --- a/cmd/cloudflared/cliutil/deprecated.go +++ b/cmd/cloudflared/cliutil/deprecated.go @@ -16,6 +16,6 @@ func RemovedCommand(name string) *cli.Command { ) }, Description: fmt.Sprintf("%s is deprecated", name), - Hidden: true, + Hidden: true, } } diff --git a/cmd/cloudflared/linux_service.go b/cmd/cloudflared/linux_service.go index e65c12fb..bade05eb 100644 --- a/cmd/cloudflared/linux_service.go +++ b/cmd/cloudflared/linux_service.go @@ -7,13 +7,13 @@ import ( "os" "path/filepath" + "github.com/rs/zerolog" + "github.com/urfave/cli/v2" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel" "github.com/cloudflare/cloudflared/config" "github.com/cloudflare/cloudflared/logger" - - "github.com/rs/zerolog" - "github.com/urfave/cli/v2" ) func runApp(app *cli.App, graceShutdownC chan struct{}) { diff --git a/cmd/cloudflared/macos_service.go b/cmd/cloudflared/macos_service.go index e7c35c09..f28396c6 100644 --- a/cmd/cloudflared/macos_service.go +++ b/cmd/cloudflared/macos_service.go @@ -6,11 +6,11 @@ import ( "fmt" "os" - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/logger" - "github.com/pkg/errors" "github.com/urfave/cli/v2" + + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/logger" ) const ( diff --git a/cmd/cloudflared/main.go b/cmd/cloudflared/main.go index 9036a5ac..7185a306 100644 --- a/cmd/cloudflared/main.go +++ b/cmd/cloudflared/main.go @@ -6,6 +6,11 @@ import ( "strings" "time" + "github.com/getsentry/raven-go" + homedir "github.com/mitchellh/go-homedir" + "github.com/pkg/errors" + "github.com/urfave/cli/v2" + "github.com/cloudflare/cloudflared/cmd/cloudflared/access" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/proxydns" @@ -16,11 +21,6 @@ import ( "github.com/cloudflare/cloudflared/metrics" "github.com/cloudflare/cloudflared/overwatch" "github.com/cloudflare/cloudflared/watcher" - - "github.com/getsentry/raven-go" - "github.com/mitchellh/go-homedir" - "github.com/pkg/errors" - "github.com/urfave/cli/v2" ) const ( diff --git a/cmd/cloudflared/service_template.go b/cmd/cloudflared/service_template.go index 089dd4e2..2aa29277 100644 --- a/cmd/cloudflared/service_template.go +++ b/cmd/cloudflared/service_template.go @@ -10,7 +10,7 @@ import ( "os/exec" "text/template" - "github.com/mitchellh/go-homedir" + homedir "github.com/mitchellh/go-homedir" "github.com/cloudflare/cloudflared/config" ) diff --git a/cmd/cloudflared/tunnel/cmd.go b/cmd/cloudflared/tunnel/cmd.go index 5591fad5..a3b9aa10 100644 --- a/cmd/cloudflared/tunnel/cmd.go +++ b/cmd/cloudflared/tunnel/cmd.go @@ -12,6 +12,15 @@ import ( "sync" "time" + "github.com/coreos/go-systemd/daemon" + "github.com/facebookgo/grace/gracenet" + "github.com/getsentry/raven-go" + homedir "github.com/mitchellh/go-homedir" + "github.com/pkg/errors" + "github.com/rs/zerolog" + "github.com/urfave/cli/v2" + "github.com/urfave/cli/v2/altsrc" + "github.com/cloudflare/cloudflared/cmd/cloudflared/buildinfo" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/proxydns" @@ -27,15 +36,6 @@ import ( "github.com/cloudflare/cloudflared/tlsconfig" "github.com/cloudflare/cloudflared/tunneldns" "github.com/cloudflare/cloudflared/tunnelstore" - - "github.com/coreos/go-systemd/daemon" - "github.com/facebookgo/grace/gracenet" - "github.com/getsentry/raven-go" - "github.com/mitchellh/go-homedir" - "github.com/pkg/errors" - "github.com/rs/zerolog" - "github.com/urfave/cli/v2" - "github.com/urfave/cli/v2/altsrc" ) const ( diff --git a/cmd/cloudflared/tunnel/configuration.go b/cmd/cloudflared/tunnel/configuration.go index d0fb810e..38b74d7c 100644 --- a/cmd/cloudflared/tunnel/configuration.go +++ b/cmd/cloudflared/tunnel/configuration.go @@ -8,6 +8,13 @@ import ( "path/filepath" "strings" + "github.com/google/uuid" + homedir "github.com/mitchellh/go-homedir" + "github.com/pkg/errors" + "github.com/rs/zerolog" + "github.com/urfave/cli/v2" + "golang.org/x/crypto/ssh/terminal" + "github.com/cloudflare/cloudflared/cmd/cloudflared/buildinfo" "github.com/cloudflare/cloudflared/config" "github.com/cloudflare/cloudflared/connection" @@ -18,13 +25,6 @@ import ( "github.com/cloudflare/cloudflared/tlsconfig" tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" "github.com/cloudflare/cloudflared/validation" - - "github.com/google/uuid" - "github.com/mitchellh/go-homedir" - "github.com/pkg/errors" - "github.com/rs/zerolog" - "github.com/urfave/cli/v2" - "golang.org/x/crypto/ssh/terminal" ) const LogFieldOriginCertPath = "originCertPath" diff --git a/cmd/cloudflared/tunnel/info.go b/cmd/cloudflared/tunnel/info.go index bea77e46..d3610f46 100644 --- a/cmd/cloudflared/tunnel/info.go +++ b/cmd/cloudflared/tunnel/info.go @@ -3,8 +3,9 @@ package tunnel import ( "time" - "github.com/cloudflare/cloudflared/tunnelstore" "github.com/google/uuid" + + "github.com/cloudflare/cloudflared/tunnelstore" ) type Info struct { diff --git a/cmd/cloudflared/tunnel/login.go b/cmd/cloudflared/tunnel/login.go index a5908d8c..7e563e0a 100644 --- a/cmd/cloudflared/tunnel/login.go +++ b/cmd/cloudflared/tunnel/login.go @@ -8,7 +8,7 @@ import ( "path/filepath" "syscall" - "github.com/mitchellh/go-homedir" + homedir "github.com/mitchellh/go-homedir" "github.com/pkg/errors" "github.com/urfave/cli/v2" diff --git a/cmd/cloudflared/tunnel/signal.go b/cmd/cloudflared/tunnel/signal.go index 0c8fc1be..9fb9741a 100644 --- a/cmd/cloudflared/tunnel/signal.go +++ b/cmd/cloudflared/tunnel/signal.go @@ -20,4 +20,4 @@ func waitForSignal(graceShutdownC chan struct{}, logger *zerolog.Logger) { close(graceShutdownC) case <-graceShutdownC: } -} \ No newline at end of file +} diff --git a/cmd/cloudflared/tunnel/signal_test.go b/cmd/cloudflared/tunnel/signal_test.go index 99028e4a..a6aa0059 100644 --- a/cmd/cloudflared/tunnel/signal_test.go +++ b/cmd/cloudflared/tunnel/signal_test.go @@ -101,4 +101,3 @@ func TestWaitForShutdown(t *testing.T) { assert.True(t, contextCancelled) assert.True(t, time.Now().Sub(startTime) < time.Second) // check that wait ended early } - diff --git a/cmd/cloudflared/tunnel/subcommand_context_teamnet.go b/cmd/cloudflared/tunnel/subcommand_context_teamnet.go index f8dd3ee2..bde2ded2 100644 --- a/cmd/cloudflared/tunnel/subcommand_context_teamnet.go +++ b/cmd/cloudflared/tunnel/subcommand_context_teamnet.go @@ -3,8 +3,9 @@ package tunnel import ( "net" - "github.com/cloudflare/cloudflared/teamnet" "github.com/pkg/errors" + + "github.com/cloudflare/cloudflared/teamnet" ) const noClientMsg = "error while creating backend client" diff --git a/cmd/cloudflared/tunnel/subcommand_context_test.go b/cmd/cloudflared/tunnel/subcommand_context_test.go index e2c129bf..be57a081 100644 --- a/cmd/cloudflared/tunnel/subcommand_context_test.go +++ b/cmd/cloudflared/tunnel/subcommand_context_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" + "github.com/google/uuid" + "github.com/pkg/errors" "github.com/rs/zerolog" + "github.com/urfave/cli/v2" "github.com/cloudflare/cloudflared/connection" "github.com/cloudflare/cloudflared/tunnelstore" - "github.com/google/uuid" - "github.com/pkg/errors" - "github.com/urfave/cli/v2" ) func Test_findIDs(t *testing.T) { diff --git a/cmd/cloudflared/tunnel/subcommands.go b/cmd/cloudflared/tunnel/subcommands.go index 65a41783..a13d2167 100644 --- a/cmd/cloudflared/tunnel/subcommands.go +++ b/cmd/cloudflared/tunnel/subcommands.go @@ -14,12 +14,12 @@ import ( "time" "github.com/google/uuid" - "github.com/mitchellh/go-homedir" + homedir "github.com/mitchellh/go-homedir" "github.com/pkg/errors" "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" "golang.org/x/net/idna" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" "github.com/cloudflare/cloudflared/cmd/cloudflared/updater" diff --git a/cmd/cloudflared/tunnel/subcommands_test.go b/cmd/cloudflared/tunnel/subcommands_test.go index 82843e01..02b6b4ff 100644 --- a/cmd/cloudflared/tunnel/subcommands_test.go +++ b/cmd/cloudflared/tunnel/subcommands_test.go @@ -5,10 +5,11 @@ import ( "path/filepath" "testing" - "github.com/cloudflare/cloudflared/tunnelstore" "github.com/google/uuid" - "github.com/mitchellh/go-homedir" + homedir "github.com/mitchellh/go-homedir" "github.com/stretchr/testify/assert" + + "github.com/cloudflare/cloudflared/tunnelstore" ) func Test_fmtConnections(t *testing.T) { diff --git a/cmd/cloudflared/ui/launch_ui.go b/cmd/cloudflared/ui/launch_ui.go index 6ca0deb0..023359ca 100644 --- a/cmd/cloudflared/ui/launch_ui.go +++ b/cmd/cloudflared/ui/launch_ui.go @@ -5,12 +5,12 @@ import ( "fmt" "strings" - "github.com/cloudflare/cloudflared/connection" - "github.com/cloudflare/cloudflared/ingress" - "github.com/gdamore/tcell" "github.com/rivo/tview" "github.com/rs/zerolog" + + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/ingress" ) type connState struct { diff --git a/cmd/cloudflared/windows_service.go b/cmd/cloudflared/windows_service.go index 8f623790..cc0b0a3c 100644 --- a/cmd/cloudflared/windows_service.go +++ b/cmd/cloudflared/windows_service.go @@ -13,15 +13,14 @@ import ( "unsafe" "github.com/pkg/errors" - - "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" - "github.com/cloudflare/cloudflared/logger" - "github.com/urfave/cli/v2" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc" "golang.org/x/sys/windows/svc/eventlog" "golang.org/x/sys/windows/svc/mgr" + + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/logger" ) const ( diff --git a/config/configuration.go b/config/configuration.go index 1b455d3a..4b9d8d25 100644 --- a/config/configuration.go +++ b/config/configuration.go @@ -9,11 +9,11 @@ import ( "runtime" "time" - "github.com/mitchellh/go-homedir" + homedir "github.com/mitchellh/go-homedir" "github.com/pkg/errors" "github.com/rs/zerolog" "github.com/urfave/cli/v2" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" "github.com/cloudflare/cloudflared/validation" ) diff --git a/config/configuration_test.go b/config/configuration_test.go index 355224fb..58ec9639 100644 --- a/config/configuration_test.go +++ b/config/configuration_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" ) func TestConfigFileSettings(t *testing.T) { diff --git a/config/manager.go b/config/manager.go index abdd1670..ec6f5630 100644 --- a/config/manager.go +++ b/config/manager.go @@ -4,11 +4,11 @@ import ( "io" "os" - "github.com/cloudflare/cloudflared/watcher" - "github.com/pkg/errors" "github.com/rs/zerolog" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" + + "github.com/cloudflare/cloudflared/watcher" ) // Notifier sends out config updates diff --git a/config/manager_test.go b/config/manager_test.go index ef752971..1de80985 100644 --- a/config/manager_test.go +++ b/config/manager_test.go @@ -4,10 +4,10 @@ import ( "os" "testing" - "github.com/cloudflare/cloudflared/watcher" - "github.com/rs/zerolog" "github.com/stretchr/testify/assert" + + "github.com/cloudflare/cloudflared/watcher" ) type mockNotifier struct { diff --git a/connection/connection.go b/connection/connection.go index 8152832f..b2f090a8 100644 --- a/connection/connection.go +++ b/connection/connection.go @@ -8,8 +8,9 @@ import ( "strings" "time" - "github.com/cloudflare/cloudflared/tunnelrpc/pogs" "github.com/google/uuid" + + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) const LogFieldConnIndex = "connIndex" diff --git a/connection/h2mux.go b/connection/h2mux.go index 5fdf59d5..4941b1d6 100644 --- a/connection/h2mux.go +++ b/connection/h2mux.go @@ -7,13 +7,13 @@ import ( "net/http" "time" - "github.com/cloudflare/cloudflared/h2mux" - tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" - "github.com/cloudflare/cloudflared/websocket" - "github.com/pkg/errors" "github.com/rs/zerolog" "golang.org/x/sync/errgroup" + + "github.com/cloudflare/cloudflared/h2mux" + tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/websocket" ) const ( diff --git a/connection/h2mux_test.go b/connection/h2mux_test.go index 3b82bfbd..cdbd2a66 100644 --- a/connection/h2mux_test.go +++ b/connection/h2mux_test.go @@ -38,7 +38,7 @@ func newH2MuxConnection(t require.TestingT) (*h2muxConnection, *h2mux.Muxer) { // we only expect RPC traffic in client->edge direction, provide minimal support for mocking require.True(t, stream.IsRPCStream()) return stream.WriteHeaders([]h2mux.Header{ - {Name: ":status", Value: "200"}, + {Name: ":status", Value: "200"}, }) }), } diff --git a/connection/http2.go b/connection/http2.go index 3412a05e..02898088 100644 --- a/connection/http2.go +++ b/connection/http2.go @@ -10,11 +10,11 @@ import ( "strings" "sync" - "github.com/cloudflare/cloudflared/h2mux" - tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" - "github.com/rs/zerolog" "golang.org/x/net/http2" + + "github.com/cloudflare/cloudflared/h2mux" + tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) const ( diff --git a/connection/http2_test.go b/connection/http2_test.go index a8d474bd..f0fe171c 100644 --- a/connection/http2_test.go +++ b/connection/http2_test.go @@ -12,15 +12,14 @@ import ( "testing" "time" + "github.com/gobwas/ws/wsutil" + "github.com/rs/zerolog" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "golang.org/x/net/http2" "github.com/cloudflare/cloudflared/tunnelrpc/pogs" tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" - - "github.com/gobwas/ws/wsutil" - "github.com/rs/zerolog" - "github.com/stretchr/testify/require" - "golang.org/x/net/http2" ) var ( diff --git a/connection/metrics.go b/connection/metrics.go index 309da6ea..b52fda0e 100644 --- a/connection/metrics.go +++ b/connection/metrics.go @@ -4,8 +4,9 @@ import ( "sync" "time" - "github.com/cloudflare/cloudflared/h2mux" "github.com/prometheus/client_golang/prometheus" + + "github.com/cloudflare/cloudflared/h2mux" ) const ( @@ -414,4 +415,4 @@ func newTunnelMetrics() *tunnelMetrics { tunnelMetricsInternal.metrics = initTunnelMetrics() }) return tunnelMetricsInternal.metrics -} \ No newline at end of file +} diff --git a/connection/observer.go b/connection/observer.go index 17047051..2ef9689c 100644 --- a/connection/observer.go +++ b/connection/observer.go @@ -5,9 +5,9 @@ import ( "net/url" "strings" - tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" - "github.com/rs/zerolog" + + tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) const ( diff --git a/connection/observer_test.go b/connection/observer_test.go index 6a6b521e..cc7f1798 100644 --- a/connection/observer_test.go +++ b/connection/observer_test.go @@ -67,10 +67,9 @@ func TestObserverEventsDontBlock(t *testing.T) { } } - type eventCollectorSink struct { observedEvents []Event - mu sync.Mutex + mu sync.Mutex } func (s *eventCollectorSink) OnTunnelEvent(event Event) { @@ -83,4 +82,4 @@ func (s *eventCollectorSink) assertSawEvent(t *testing.T, event Event) { s.mu.Lock() defer s.mu.Unlock() assert.Contains(t, s.observedEvents, event) -} \ No newline at end of file +} diff --git a/connection/rpc.go b/connection/rpc.go index a1006334..7ae55d40 100644 --- a/connection/rpc.go +++ b/connection/rpc.go @@ -6,11 +6,11 @@ import ( "io" "time" - "github.com/cloudflare/cloudflared/tunnelrpc" - tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" - "github.com/rs/zerolog" "zombiezen.com/go/capnproto2/rpc" + + "github.com/cloudflare/cloudflared/tunnelrpc" + tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) type tunnelServerClient struct { diff --git a/edgediscovery/edgediscovery.go b/edgediscovery/edgediscovery.go index fc7caa90..a559ae36 100644 --- a/edgediscovery/edgediscovery.go +++ b/edgediscovery/edgediscovery.go @@ -5,8 +5,9 @@ import ( "net" "sync" - "github.com/cloudflare/cloudflared/edgediscovery/allregions" "github.com/rs/zerolog" + + "github.com/cloudflare/cloudflared/edgediscovery/allregions" ) const ( diff --git a/fmt-check.sh b/fmt-check.sh new file mode 100755 index 00000000..8b64765e --- /dev/null +++ b/fmt-check.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +set -e -o pipefail + +OUTPUT=$(for d in $(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc) ; do goimports -format-only -local github.com/cloudflare/cloudflared -d $d ; done) + +if [ -n "$OUTPUT" ] ; then + PAGER=$(which colordiff || echo cat) + echo + echo "Code formatting issues found, use 'goimports -format-only -local github.com/cloudflare/cloudflared' to correct them" + echo + echo "$OUTPUT" | $PAGER + exit 1 +fi diff --git a/h2mux/muxwriter.go b/h2mux/muxwriter.go index 9f5e4064..6956876e 100644 --- a/h2mux/muxwriter.go +++ b/h2mux/muxwriter.go @@ -3,10 +3,11 @@ package h2mux import ( "bytes" "encoding/binary" - "github.com/rs/zerolog" "io" "time" + "github.com/rs/zerolog" + "golang.org/x/net/http2" "golang.org/x/net/http2/hpack" ) diff --git a/ingress/ingress.go b/ingress/ingress.go index 9985595c..db951216 100644 --- a/ingress/ingress.go +++ b/ingress/ingress.go @@ -9,12 +9,12 @@ import ( "strings" "sync" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/ipaccess" - "github.com/pkg/errors" "github.com/rs/zerolog" "github.com/urfave/cli/v2" + + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/ipaccess" ) var ( diff --git a/ingress/ingress_test.go b/ingress/ingress_test.go index ecbb54ba..12eb8ed6 100644 --- a/ingress/ingress_test.go +++ b/ingress/ingress_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" "github.com/cloudflare/cloudflared/config" "github.com/cloudflare/cloudflared/ipaccess" diff --git a/ingress/origin_connection.go b/ingress/origin_connection.go index 8dc651ff..63151f33 100644 --- a/ingress/origin_connection.go +++ b/ingress/origin_connection.go @@ -7,11 +7,12 @@ import ( "net" "net/http" + gws "github.com/gorilla/websocket" + "github.com/rs/zerolog" + "github.com/cloudflare/cloudflared/ipaccess" "github.com/cloudflare/cloudflared/socks" "github.com/cloudflare/cloudflared/websocket" - gws "github.com/gorilla/websocket" - "github.com/rs/zerolog" ) // OriginConnection is a way to stream to a service running on the user's origin. diff --git a/ingress/origin_connection_test.go b/ingress/origin_connection_test.go index 4e7b7ee8..3c853d21 100644 --- a/ingress/origin_connection_test.go +++ b/ingress/origin_connection_test.go @@ -13,14 +13,15 @@ import ( "testing" "time" - "github.com/cloudflare/cloudflared/logger" - "github.com/cloudflare/cloudflared/socks" "github.com/gobwas/ws/wsutil" gorillaWS "github.com/gorilla/websocket" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/proxy" "golang.org/x/sync/errgroup" + + "github.com/cloudflare/cloudflared/logger" + "github.com/cloudflare/cloudflared/socks" ) const ( diff --git a/ingress/origin_proxy.go b/ingress/origin_proxy.go index 14162023..2c01170c 100644 --- a/ingress/origin_proxy.go +++ b/ingress/origin_proxy.go @@ -7,9 +7,10 @@ import ( "net/url" "strings" + "github.com/pkg/errors" + "github.com/cloudflare/cloudflared/h2mux" "github.com/cloudflare/cloudflared/websocket" - "github.com/pkg/errors" ) var ( diff --git a/ingress/origin_proxy_test.go b/ingress/origin_proxy_test.go index b0202b5f..e9153a1c 100644 --- a/ingress/origin_proxy_test.go +++ b/ingress/origin_proxy_test.go @@ -11,10 +11,11 @@ import ( "sync" "testing" - "github.com/cloudflare/cloudflared/h2mux" - "github.com/cloudflare/cloudflared/websocket" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/cloudflare/cloudflared/h2mux" + "github.com/cloudflare/cloudflared/websocket" ) // TestEstablishConnectionResponse ensures each implementation of StreamBasedOriginProxy returns diff --git a/ingress/origin_request_config.go b/ingress/origin_request_config.go index 02b15c4b..f8f06d2d 100644 --- a/ingress/origin_request_config.go +++ b/ingress/origin_request_config.go @@ -3,10 +3,10 @@ package ingress import ( "time" - "github.com/cloudflare/cloudflared/ipaccess" "github.com/urfave/cli/v2" "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/ipaccess" "github.com/cloudflare/cloudflared/tlsconfig" ) diff --git a/ingress/origin_request_config_test.go b/ingress/origin_request_config_test.go index 23a4b788..d4113d1d 100644 --- a/ingress/origin_request_config_test.go +++ b/ingress/origin_request_config_test.go @@ -5,10 +5,11 @@ import ( "testing" "time" - "github.com/cloudflare/cloudflared/config" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v2" + + "github.com/cloudflare/cloudflared/config" ) // Ensure that the nullable config from `config` package and the diff --git a/ingress/origin_service.go b/ingress/origin_service.go index e621cf73..eeff7ebc 100644 --- a/ingress/origin_service.go +++ b/ingress/origin_service.go @@ -11,14 +11,15 @@ import ( "sync" "time" + gws "github.com/gorilla/websocket" + "github.com/pkg/errors" + "github.com/rs/zerolog" + "github.com/cloudflare/cloudflared/hello" "github.com/cloudflare/cloudflared/ipaccess" "github.com/cloudflare/cloudflared/socks" "github.com/cloudflare/cloudflared/tlsconfig" "github.com/cloudflare/cloudflared/websocket" - gws "github.com/gorilla/websocket" - "github.com/pkg/errors" - "github.com/rs/zerolog" ) // originService is something a tunnel can proxy traffic to. diff --git a/logger/create_test.go b/logger/create_test.go index 2e503f9e..21ede396 100644 --- a/logger/create_test.go +++ b/logger/create_test.go @@ -1,11 +1,12 @@ package logger import ( + "io" + "testing" + "github.com/pkg/errors" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "io" - "testing" ) var writeCalls int @@ -31,45 +32,45 @@ func TestResilientMultiWriter(t *testing.T) { writers []io.Writer }{ { - name: "All valid writers", + name: "All valid writers", writers: []io.Writer{ - mockedWriter { + mockedWriter{ wantErr: false, }, - mockedWriter { + mockedWriter{ wantErr: false, }, }, }, { - name: "All invalid writers", + name: "All invalid writers", writers: []io.Writer{ - mockedWriter { + mockedWriter{ wantErr: true, }, - mockedWriter { + mockedWriter{ wantErr: true, }, }, }, { - name: "First invalid writer", + name: "First invalid writer", writers: []io.Writer{ - mockedWriter { + mockedWriter{ wantErr: true, }, - mockedWriter { + mockedWriter{ wantErr: false, }, }, }, { - name: "First valid writer", + name: "First valid writer", writers: []io.Writer{ - mockedWriter { + mockedWriter{ wantErr: false, }, - mockedWriter { + mockedWriter{ wantErr: true, }, }, @@ -86,4 +87,4 @@ func TestResilientMultiWriter(t *testing.T) { assert.Equal(t, len(writers), writeCalls) writeCalls = 0 } -} \ No newline at end of file +} diff --git a/metrics/timer.go b/metrics/timer.go index 7733e7fc..b4f0ae85 100644 --- a/metrics/timer.go +++ b/metrics/timer.go @@ -1,47 +1,48 @@ package metrics import ( - "time" - "github.com/prometheus/client_golang/prometheus" + "time" + + "github.com/prometheus/client_golang/prometheus" ) // Timer assumes the metrics is partitioned by one label type Timer struct { - startTime map[string]time.Time - metrics *prometheus.HistogramVec - measureUnit time.Duration - labelKey string + startTime map[string]time.Time + metrics *prometheus.HistogramVec + measureUnit time.Duration + labelKey string } func NewTimer(metrics *prometheus.HistogramVec, unit time.Duration, labelKey string) *Timer { - return &Timer{ - startTime: make(map[string]time.Time), - measureUnit: unit, - metrics: metrics, - labelKey: labelKey, - } + return &Timer{ + startTime: make(map[string]time.Time), + measureUnit: unit, + metrics: metrics, + labelKey: labelKey, + } } func (i *Timer) Start(labelVal string) { - i.startTime[labelVal] = time.Now() + i.startTime[labelVal] = time.Now() } func (i *Timer) End(labelVal string) time.Duration { - if start, ok := i.startTime[labelVal]; ok { - return Latency(start, time.Now()) - } - return 0 + if start, ok := i.startTime[labelVal]; ok { + return Latency(start, time.Now()) + } + return 0 } func (i *Timer) Observe(measurement time.Duration, labelVal string) { - metricsLabels := prometheus.Labels{i.labelKey: labelVal} - i.metrics.With(metricsLabels).Observe(float64(measurement / i.measureUnit)) + metricsLabels := prometheus.Labels{i.labelKey: labelVal} + i.metrics.With(metricsLabels).Observe(float64(measurement / i.measureUnit)) } func (i *Timer) EndAndObserve(labelVal string) { - i.Observe(i.End(labelVal), labelVal) + i.Observe(i.End(labelVal), labelVal) } func Latency(startTime, endTime time.Time) time.Duration { - return endTime.Sub(startTime) + return endTime.Sub(startTime) } diff --git a/metrics/timer_test.go b/metrics/timer_test.go index a800d193..18c8ef6a 100644 --- a/metrics/timer_test.go +++ b/metrics/timer_test.go @@ -1,24 +1,24 @@ package metrics import ( - "testing" - "time" + "testing" + "time" - "github.com/prometheus/client_golang/prometheus" - "github.com/stretchr/testify/assert" + "github.com/prometheus/client_golang/prometheus" + "github.com/stretchr/testify/assert" ) func TestEnd(t *testing.T) { - m := prometheus.NewHistogramVec( - prometheus.HistogramOpts{ - Namespace: "TestCallLatencyWithoutMeasurement", - Name: "Latency", - Buckets: prometheus.LinearBuckets(0, 50, 100), - }, - []string{"key"}, - ) - timer := NewTimer(m, time.Millisecond, "key") - assert.Equal(t, time.Duration(0), timer.End("dne")) - timer.Start("test") - assert.NotEqual(t, time.Duration(0), timer.End("test")) + m := prometheus.NewHistogramVec( + prometheus.HistogramOpts{ + Namespace: "TestCallLatencyWithoutMeasurement", + Name: "Latency", + Buckets: prometheus.LinearBuckets(0, 50, 100), + }, + []string{"key"}, + ) + timer := NewTimer(m, time.Millisecond, "key") + assert.Equal(t, time.Duration(0), timer.End("dne")) + timer.Start("test") + assert.NotEqual(t, time.Duration(0), timer.End("test")) } diff --git a/origin/cloudflared.log b/origin/cloudflared.log deleted file mode 100644 index e69de29b..00000000 diff --git a/origin/metrics.go b/origin/metrics.go index b1064803..1e54f271 100644 --- a/origin/metrics.go +++ b/origin/metrics.go @@ -1,8 +1,9 @@ package origin import ( - "github.com/cloudflare/cloudflared/connection" "github.com/prometheus/client_golang/prometheus" + + "github.com/cloudflare/cloudflared/connection" ) // Metrics uses connection.MetricsNamespace(aka cloudflared) as namespace and connection.TunnelSubsystem diff --git a/origin/proxy_test.go b/origin/proxy_test.go index e29874bd..dc4bdbe4 100644 --- a/origin/proxy_test.go +++ b/origin/proxy_test.go @@ -13,20 +13,19 @@ import ( "testing" "time" - "github.com/cloudflare/cloudflared/logger" + "github.com/gobwas/ws/wsutil" + gorillaWS "github.com/gorilla/websocket" + "github.com/rs/zerolog" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/urfave/cli/v2" "github.com/cloudflare/cloudflared/config" "github.com/cloudflare/cloudflared/connection" "github.com/cloudflare/cloudflared/hello" "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/logger" tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" - gorillaWS "github.com/gorilla/websocket" - "github.com/urfave/cli/v2" - - "github.com/gobwas/ws/wsutil" - "github.com/rs/zerolog" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) var ( diff --git a/origin/reconnect.go b/origin/reconnect.go index c05c66e2..b832c372 100644 --- a/origin/reconnect.go +++ b/origin/reconnect.go @@ -7,8 +7,9 @@ import ( "sync" "time" - tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" "github.com/prometheus/client_golang/prometheus" + + tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) var ( diff --git a/origin/supervisor.go b/origin/supervisor.go index 1e618512..b8c459aa 100644 --- a/origin/supervisor.go +++ b/origin/supervisor.go @@ -7,14 +7,14 @@ import ( "net" "time" + "github.com/google/uuid" + "github.com/rs/zerolog" + "github.com/cloudflare/cloudflared/connection" "github.com/cloudflare/cloudflared/edgediscovery" "github.com/cloudflare/cloudflared/h2mux" "github.com/cloudflare/cloudflared/signal" tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" - - "github.com/google/uuid" - "github.com/rs/zerolog" ) const ( diff --git a/origin/tunnel_test.go b/origin/tunnel_test.go index d5696c41..9be42fa8 100644 --- a/origin/tunnel_test.go +++ b/origin/tunnel_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/cloudflare/cloudflared/connection" - "github.com/rs/zerolog" "github.com/stretchr/testify/assert" + + "github.com/cloudflare/cloudflared/connection" ) type dynamicMockFetcher struct { diff --git a/socks/request_handler.go b/socks/request_handler.go index d9266275..b134dc6b 100644 --- a/socks/request_handler.go +++ b/socks/request_handler.go @@ -6,8 +6,9 @@ import ( "net" "strings" - "github.com/cloudflare/cloudflared/ipaccess" "github.com/rs/zerolog" + + "github.com/cloudflare/cloudflared/ipaccess" ) // RequestHandler is the functions needed to handle a SOCKS5 command diff --git a/socks/request_handler_test.go b/socks/request_handler_test.go index e45b5dbf..401b2017 100644 --- a/socks/request_handler_test.go +++ b/socks/request_handler_test.go @@ -4,8 +4,9 @@ import ( "bytes" "testing" - "github.com/cloudflare/cloudflared/ipaccess" "github.com/stretchr/testify/assert" + + "github.com/cloudflare/cloudflared/ipaccess" ) func TestUnsupportedBind(t *testing.T) { diff --git a/sshgen/sshgen.go b/sshgen/sshgen.go index baa74379..47cc7297 100644 --- a/sshgen/sshgen.go +++ b/sshgen/sshgen.go @@ -18,6 +18,7 @@ import ( homedir "github.com/mitchellh/go-homedir" "github.com/pkg/errors" gossh "golang.org/x/crypto/ssh" + "github.com/cloudflare/cloudflared/config" cfpath "github.com/cloudflare/cloudflared/token" ) diff --git a/token/path.go b/token/path.go index d5b60190..e0806d64 100644 --- a/token/path.go +++ b/token/path.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/mitchellh/go-homedir" + homedir "github.com/mitchellh/go-homedir" "github.com/cloudflare/cloudflared/config" ) diff --git a/token/shell.go b/token/shell.go index 7cfe1a78..569cdd52 100644 --- a/token/shell.go +++ b/token/shell.go @@ -4,4 +4,3 @@ package token func OpenBrowser(url string) error { return getBrowserCmd(url).Start() } - diff --git a/token/token.go b/token/token.go index 29af6559..ab04973c 100644 --- a/token/token.go +++ b/token/token.go @@ -13,12 +13,12 @@ import ( "syscall" "time" - "github.com/cloudflare/cloudflared/config" - "github.com/cloudflare/cloudflared/origin" - "github.com/coreos/go-oidc/jose" "github.com/pkg/errors" "github.com/rs/zerolog" + + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/origin" ) const ( diff --git a/token/token_test.go b/token/token_test.go index 1399ce7c..65d9a751 100644 --- a/token/token_test.go +++ b/token/token_test.go @@ -17,7 +17,7 @@ func TestSignalHandler(t *testing.T) { handlerRan := false done := make(chan struct{}) timer := time.NewTimer(time.Second) - sigHandler.register(func(){ + sigHandler.register(func() { handlerRan = true done <- struct{}{} }) @@ -28,10 +28,10 @@ func TestSignalHandler(t *testing.T) { // Blocks for up to one second to make sure the handler callback runs before the assert. select { - case <- done: - assert.True(t, handlerRan) - case <- timer.C: - t.Fail() + case <-done: + assert.True(t, handlerRan) + case <-timer.C: + t.Fail() } sigHandler.deregister() } @@ -40,15 +40,15 @@ func TestSignalHandlerClose(t *testing.T) { sigHandler := signalHandler{signals: []os.Signal{syscall.SIGUSR1}} done := make(chan struct{}) timer := time.NewTimer(time.Second) - sigHandler.register(func(){done <- struct{}{}}) + sigHandler.register(func() { done <- struct{}{} }) sigHandler.deregister() p, err := os.FindProcess(os.Getpid()) require.Nil(t, err) p.Signal(syscall.SIGUSR1) select { - case <- done: + case <-done: t.Fail() - case <- timer.C: + case <-timer.C: } } diff --git a/tunnelrpc/pogs/auth_outcome.go b/tunnelrpc/pogs/auth_outcome.go index 44341ba9..4620cea0 100644 --- a/tunnelrpc/pogs/auth_outcome.go +++ b/tunnelrpc/pogs/auth_outcome.go @@ -129,4 +129,4 @@ func (ao AuthUnknown) isAuthOutcome() {} func hoursToTime(hours uint8) time.Duration { return time.Duration(hours) * time.Hour -} \ No newline at end of file +} diff --git a/tunnelrpc/pogs/auth_serialize.go b/tunnelrpc/pogs/auth_serialize.go index b6caa7c3..a54cbaae 100644 --- a/tunnelrpc/pogs/auth_serialize.go +++ b/tunnelrpc/pogs/auth_serialize.go @@ -3,10 +3,10 @@ package pogs import ( "context" - "github.com/cloudflare/cloudflared/tunnelrpc" - "zombiezen.com/go/capnproto2/pogs" "zombiezen.com/go/capnproto2/server" + + "github.com/cloudflare/cloudflared/tunnelrpc" ) func (i TunnelServer_PogsImpl) Authenticate(p tunnelrpc.TunnelServer_authenticate) error { diff --git a/tunnelrpc/pogs/auth_test.go b/tunnelrpc/pogs/auth_test.go index fcc217f5..40db1ef7 100644 --- a/tunnelrpc/pogs/auth_test.go +++ b/tunnelrpc/pogs/auth_test.go @@ -6,9 +6,10 @@ import ( "testing" "time" - "github.com/cloudflare/cloudflared/tunnelrpc" "github.com/stretchr/testify/assert" capnp "zombiezen.com/go/capnproto2" + + "github.com/cloudflare/cloudflared/tunnelrpc" ) // Ensure the AuthOutcome sum is correct diff --git a/tunnelrpc/pogs/reconnect_tunnel.go b/tunnelrpc/pogs/reconnect_tunnel.go index 9c1801be..3a9dabfa 100644 --- a/tunnelrpc/pogs/reconnect_tunnel.go +++ b/tunnelrpc/pogs/reconnect_tunnel.go @@ -3,8 +3,9 @@ package pogs import ( "context" - "github.com/cloudflare/cloudflared/tunnelrpc" "zombiezen.com/go/capnproto2/server" + + "github.com/cloudflare/cloudflared/tunnelrpc" ) func (i TunnelServer_PogsImpl) ReconnectTunnel(p tunnelrpc.TunnelServer_reconnectTunnel) error { diff --git a/tunnelrpc/pogs/support_test.go b/tunnelrpc/pogs/support_test.go index bd54329a..dc98ed39 100644 --- a/tunnelrpc/pogs/support_test.go +++ b/tunnelrpc/pogs/support_test.go @@ -38,4 +38,3 @@ func (mockTunnelServerBase) Authenticate(ctx context.Context, originCert []byte, func (mockTunnelServerBase) ReconnectTunnel(ctx context.Context, jwt, eventDigest, connDigest []byte, hostname string, options *RegistrationOptions) (*TunnelRegistration, error) { panic("unexpected call to ReconnectTunnel") } - diff --git a/tunnelrpc/pogs/tunnelrpc.go b/tunnelrpc/pogs/tunnelrpc.go index 4483c9a6..cb581568 100644 --- a/tunnelrpc/pogs/tunnelrpc.go +++ b/tunnelrpc/pogs/tunnelrpc.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/cloudflare/cloudflared/tunnelrpc" - capnp "zombiezen.com/go/capnproto2" "zombiezen.com/go/capnproto2/pogs" "zombiezen.com/go/capnproto2/rpc" "zombiezen.com/go/capnproto2/server" + + "github.com/cloudflare/cloudflared/tunnelrpc" ) const ( diff --git a/tunnelrpc/pogs/tunnelrpc_test.go b/tunnelrpc/pogs/tunnelrpc_test.go index e133f877..372c69f3 100644 --- a/tunnelrpc/pogs/tunnelrpc_test.go +++ b/tunnelrpc/pogs/tunnelrpc_test.go @@ -4,9 +4,10 @@ import ( "fmt" "testing" - "github.com/cloudflare/cloudflared/tunnelrpc" "github.com/stretchr/testify/assert" capnp "zombiezen.com/go/capnproto2" + + "github.com/cloudflare/cloudflared/tunnelrpc" ) const ( diff --git a/tunnelstore/client.go b/tunnelstore/client.go index db8330fe..f5915103 100644 --- a/tunnelstore/client.go +++ b/tunnelstore/client.go @@ -12,10 +12,11 @@ import ( "strings" "time" - "github.com/cloudflare/cloudflared/teamnet" "github.com/google/uuid" "github.com/pkg/errors" "github.com/rs/zerolog" + + "github.com/cloudflare/cloudflared/teamnet" ) const ( diff --git a/tunnelstore/client_teamnet.go b/tunnelstore/client_teamnet.go index 04939038..5e8addec 100644 --- a/tunnelstore/client_teamnet.go +++ b/tunnelstore/client_teamnet.go @@ -7,8 +7,9 @@ import ( "net/url" "path" - "github.com/cloudflare/cloudflared/teamnet" "github.com/pkg/errors" + + "github.com/cloudflare/cloudflared/teamnet" ) // ListRoutes calls the Tunnelstore GET endpoint for all routes under an account. diff --git a/validation/validation.go b/validation/validation.go index 3a5bfa83..fe4f0c29 100644 --- a/validation/validation.go +++ b/validation/validation.go @@ -4,12 +4,11 @@ import ( "context" "fmt" "net" + "net/http" "net/url" "strings" "time" - "net/http" - "github.com/pkg/errors" "golang.org/x/net/idna" "gopkg.in/coreos/go-oidc.v2" diff --git a/websocket/websocket.go b/websocket/websocket.go index 60e6edfd..74289b40 100644 --- a/websocket/websocket.go +++ b/websocket/websocket.go @@ -9,10 +9,10 @@ import ( "net/url" "time" - "github.com/cloudflare/cloudflared/h2mux" - "github.com/gorilla/websocket" "github.com/rs/zerolog" + + "github.com/cloudflare/cloudflared/h2mux" ) var stripWebsocketHeaders = []string{ diff --git a/websocket/websocket_test.go b/websocket/websocket_test.go index 035d83a5..639be802 100644 --- a/websocket/websocket_test.go +++ b/websocket/websocket_test.go @@ -11,14 +11,14 @@ import ( "testing" "time" - "github.com/rs/zerolog" - - "github.com/cloudflare/cloudflared/hello" - "github.com/cloudflare/cloudflared/tlsconfig" gws "github.com/gorilla/websocket" + "github.com/rs/zerolog" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/net/websocket" + + "github.com/cloudflare/cloudflared/hello" + "github.com/cloudflare/cloudflared/tlsconfig" ) const (