diff --git a/.circleci/config.yml b/.circleci/config.yml index dbb5c348f9..1ae1efa07b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,6 +23,35 @@ references: S3_ARTIFACT_BUCKET: consul-dev-artifacts jobs: + # Runs go fmt and go vet + go-fmt-and-vet: + docker: + - image: *GOLANG_IMAGE + steps: + - checkout + - restore_cache: + keys: + - consul-modcache-v1-{{ checksum "go.mod" }} + - run: + command: go mod download + - save_cache: + key: consul-modcache-v1-{{ checksum "go.mod" }} + paths: + - /go/pkg/mod + - run: + name: check go fmt + command: | + files=$(go fmt ./...) + if [ -n "$files" ]; then + echo "The following file(s) do not conform to go fmt:" + echo "$files" + exit 1 + fi + - run: + command: go vet ./... + environment: + <<: *ENVIRONMENT + # build all distros build-distros: &build-distros docker: @@ -288,9 +317,12 @@ workflows: version: 2 build-distros: jobs: - - build-386 - - build-amd64 - - build-arm-arm64 + - go-fmt-and-vet + - build-386: &require-go-fmt-vet + requires: + - go-fmt-and-vet + - build-amd64: *require-go-fmt-vet + - build-arm-arm64: *require-go-fmt-vet test-integrations: jobs: - dev-build diff --git a/agent/consul/acl_endpoint_test.go b/agent/consul/acl_endpoint_test.go index 7b79067aaa..c88ba1563f 100644 --- a/agent/consul/acl_endpoint_test.go +++ b/agent/consul/acl_endpoint_test.go @@ -15,8 +15,8 @@ import ( "github.com/hashicorp/consul/agent/structs" tokenStore "github.com/hashicorp/consul/agent/token" "github.com/hashicorp/consul/lib" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" uuid "github.com/hashicorp/go-uuid" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" "github.com/stretchr/testify/require" diff --git a/agent/consul/acl_replication_legacy_test.go b/agent/consul/acl_replication_legacy_test.go index ed36865564..a1eea646f2 100644 --- a/agent/consul/acl_replication_legacy_test.go +++ b/agent/consul/acl_replication_legacy_test.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/consul/agent/structs" tokenStore "github.com/hashicorp/consul/agent/token" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" ) func TestACLReplication_Sorter(t *testing.T) { diff --git a/agent/consul/acl_replication_test.go b/agent/consul/acl_replication_test.go index 7a9744801d..86c939c6ae 100644 --- a/agent/consul/acl_replication_test.go +++ b/agent/consul/acl_replication_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/agent/structs" tokenStore "github.com/hashicorp/consul/agent/token" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/stretchr/testify/require" ) diff --git a/agent/consul/autopilot_test.go b/agent/consul/autopilot_test.go index 232cf720de..35a914eb2e 100644 --- a/agent/consul/autopilot_test.go +++ b/agent/consul/autopilot_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/raft" "github.com/hashicorp/serf/serf" ) diff --git a/agent/consul/client_test.go b/agent/consul/client_test.go index ef25dbf884..1b3728c282 100644 --- a/agent/consul/client_test.go +++ b/agent/consul/client_test.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/sdk/freeport" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/net-rpc-msgpackrpc" "github.com/hashicorp/serf/serf" "github.com/stretchr/testify/require" diff --git a/agent/consul/connect_ca_endpoint_test.go b/agent/consul/connect_ca_endpoint_test.go index 1e98a7c464..63114930c8 100644 --- a/agent/consul/connect_ca_endpoint_test.go +++ b/agent/consul/connect_ca_endpoint_test.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/consul/agent/connect" ca "github.com/hashicorp/consul/agent/connect/ca" "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc" "github.com/stretchr/testify/assert" ) diff --git a/agent/consul/coordinate_endpoint_test.go b/agent/consul/coordinate_endpoint_test.go index ead5481339..e1b90f5043 100644 --- a/agent/consul/coordinate_endpoint_test.go +++ b/agent/consul/coordinate_endpoint_test.go @@ -13,8 +13,8 @@ import ( "github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/lib" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/net-rpc-msgpackrpc" "github.com/hashicorp/serf/coordinate" "github.com/pascaldekloe/goe/verify" diff --git a/agent/consul/leader_test.go b/agent/consul/leader_test.go index 556e37798b..b6dc58bce0 100644 --- a/agent/consul/leader_test.go +++ b/agent/consul/leader_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/api" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/net-rpc-msgpackrpc" "github.com/hashicorp/serf/serf" "github.com/stretchr/testify/require" diff --git a/agent/consul/operator_autopilot_endpoint_test.go b/agent/consul/operator_autopilot_endpoint_test.go index 2ce91bf629..4728f8436a 100644 --- a/agent/consul/operator_autopilot_endpoint_test.go +++ b/agent/consul/operator_autopilot_endpoint_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/agent/consul/autopilot" "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/net-rpc-msgpackrpc" "github.com/hashicorp/raft" ) diff --git a/agent/consul/prepared_query_endpoint_test.go b/agent/consul/prepared_query_endpoint_test.go index 90532c4af1..c4ae24233d 100644 --- a/agent/consul/prepared_query_endpoint_test.go +++ b/agent/consul/prepared_query_endpoint_test.go @@ -15,8 +15,8 @@ import ( "github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/api" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/types" "github.com/hashicorp/net-rpc-msgpackrpc" "github.com/hashicorp/serf/coordinate" diff --git a/agent/consul/rpc_test.go b/agent/consul/rpc_test.go index 186e08d204..e147a8b577 100644 --- a/agent/consul/rpc_test.go +++ b/agent/consul/rpc_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/consul/agent/consul/state" "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/go-memdb" "github.com/hashicorp/net-rpc-msgpackrpc" "github.com/stretchr/testify/assert" diff --git a/agent/consul/server_test.go b/agent/consul/server_test.go index 9aa48ad785..86505b906a 100644 --- a/agent/consul/server_test.go +++ b/agent/consul/server_test.go @@ -15,9 +15,9 @@ import ( "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/token" "github.com/hashicorp/consul/sdk/freeport" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/tlsutil" "github.com/hashicorp/consul/types" "github.com/hashicorp/go-uuid" diff --git a/agent/consul/session_ttl_test.go b/agent/consul/session_ttl_test.go index abc30e599b..67294e8db0 100644 --- a/agent/consul/session_ttl_test.go +++ b/agent/consul/session_ttl_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/hashicorp/consul/agent/structs" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/go-uuid" "github.com/hashicorp/net-rpc-msgpackrpc" ) diff --git a/agent/consul/snapshot_endpoint_test.go b/agent/consul/snapshot_endpoint_test.go index 892c94dd04..62ed89fac2 100644 --- a/agent/consul/snapshot_endpoint_test.go +++ b/agent/consul/snapshot_endpoint_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/consul/acl" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/api" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/net-rpc-msgpackrpc" ) diff --git a/agent/dns_test.go b/agent/dns_test.go index 571684385c..fbb02d672a 100644 --- a/agent/dns_test.go +++ b/agent/dns_test.go @@ -14,8 +14,8 @@ import ( "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/lib" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/serf/coordinate" "github.com/miekg/dns" "github.com/pascaldekloe/goe/verify" diff --git a/agent/remote_exec_test.go b/agent/remote_exec_test.go index 0b3dfbb348..60ac949351 100644 --- a/agent/remote_exec_test.go +++ b/agent/remote_exec_test.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/api" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/go-uuid" ) diff --git a/agent/txn_endpoint.go b/agent/txn_endpoint.go index eaad624065..d02baf775a 100644 --- a/agent/txn_endpoint.go +++ b/agent/txn_endpoint.go @@ -253,13 +253,13 @@ func (s *HTTPServer) convertOps(resp http.ResponseWriter, req *http.Request) (st ServiceName: check.ServiceName, ServiceTags: check.ServiceTags, Definition: structs.HealthCheckDefinition{ - HTTP: check.Definition.HTTP, - TLSSkipVerify: check.Definition.TLSSkipVerify, - Header: check.Definition.Header, - Method: check.Definition.Method, - TCP: check.Definition.TCP, - Interval: interval, - Timeout: timeout, + HTTP: check.Definition.HTTP, + TLSSkipVerify: check.Definition.TLSSkipVerify, + Header: check.Definition.Header, + Method: check.Definition.Method, + TCP: check.Definition.TCP, + Interval: interval, + Timeout: timeout, DeregisterCriticalServiceAfter: deregisterCriticalServiceAfter, }, RaftIndex: structs.RaftIndex{ diff --git a/agent/txn_endpoint_test.go b/agent/txn_endpoint_test.go index 7a84bb04f7..1d6d0e8d65 100644 --- a/agent/txn_endpoint_test.go +++ b/agent/txn_endpoint_test.go @@ -510,11 +510,11 @@ func TestTxnEndpoint_UpdateCheck(t *testing.T) { Status: api.HealthCritical, Notes: "Http based health check", Definition: structs.HealthCheckDefinition{ - Interval: 6 * time.Second, - Timeout: 6 * time.Second, + Interval: 6 * time.Second, + Timeout: 6 * time.Second, DeregisterCriticalServiceAfter: 6 * time.Second, - HTTP: "http://localhost:8000", - TLSSkipVerify: true, + HTTP: "http://localhost:8000", + TLSSkipVerify: true, }, RaftIndex: structs.RaftIndex{ CreateIndex: index, @@ -531,11 +531,11 @@ func TestTxnEndpoint_UpdateCheck(t *testing.T) { Notes: "Http based health check", Output: "success", Definition: structs.HealthCheckDefinition{ - Interval: 10 * time.Second, - Timeout: 10 * time.Second, + Interval: 10 * time.Second, + Timeout: 10 * time.Second, DeregisterCriticalServiceAfter: 15 * time.Minute, - HTTP: "http://localhost:9000", - TLSSkipVerify: false, + HTTP: "http://localhost:9000", + TLSSkipVerify: false, }, RaftIndex: structs.RaftIndex{ CreateIndex: index, @@ -552,11 +552,11 @@ func TestTxnEndpoint_UpdateCheck(t *testing.T) { Notes: "Http based health check", Output: "success", Definition: structs.HealthCheckDefinition{ - Interval: 15 * time.Second, - Timeout: 15 * time.Second, + Interval: 15 * time.Second, + Timeout: 15 * time.Second, DeregisterCriticalServiceAfter: 30 * time.Minute, - HTTP: "http://localhost:9000", - TLSSkipVerify: false, + HTTP: "http://localhost:9000", + TLSSkipVerify: false, }, RaftIndex: structs.RaftIndex{ CreateIndex: index, diff --git a/command/acl/agenttokens/agent_tokens_test.go b/command/acl/agenttokens/agent_tokens_test.go index 62c8223217..7093ec5922 100644 --- a/command/acl/agenttokens/agent_tokens_test.go +++ b/command/acl/agenttokens/agent_tokens_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/command/acl/bootstrap/bootstrap_test.go b/command/acl/bootstrap/bootstrap_test.go index 0023ba08f9..b017ec8845 100644 --- a/command/acl/bootstrap/bootstrap_test.go +++ b/command/acl/bootstrap/bootstrap_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/command/acl/policy/create/policy_create_test.go b/command/acl/policy/create/policy_create_test.go index d898f6156e..a9f917491c 100644 --- a/command/acl/policy/create/policy_create_test.go +++ b/command/acl/policy/create/policy_create_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/command/acl/policy/delete/policy_delete_test.go b/command/acl/policy/delete/policy_delete_test.go index 5066f9015e..bbc3edd76d 100644 --- a/command/acl/policy/delete/policy_delete_test.go +++ b/command/acl/policy/delete/policy_delete_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/command/acl/policy/list/policy_list_test.go b/command/acl/policy/list/policy_list_test.go index 446f2b7094..45c708fb3b 100644 --- a/command/acl/policy/list/policy_list_test.go +++ b/command/acl/policy/list/policy_list_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/command/acl/policy/read/policy_read_test.go b/command/acl/policy/read/policy_read_test.go index 45febad6f2..2ca2fcfd7e 100644 --- a/command/acl/policy/read/policy_read_test.go +++ b/command/acl/policy/read/policy_read_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/command/acl/policy/update/policy_update_test.go b/command/acl/policy/update/policy_update_test.go index e329228657..8d93b5e748 100644 --- a/command/acl/policy/update/policy_update_test.go +++ b/command/acl/policy/update/policy_update_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/command/acl/token/clone/token_clone_test.go b/command/acl/token/clone/token_clone_test.go index 10b2cfe98b..0baa0c4f2e 100644 --- a/command/acl/token/clone/token_clone_test.go +++ b/command/acl/token/clone/token_clone_test.go @@ -10,8 +10,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/require" ) diff --git a/command/acl/token/create/token_create_test.go b/command/acl/token/create/token_create_test.go index 001a058ed4..c092180cc3 100644 --- a/command/acl/token/create/token_create_test.go +++ b/command/acl/token/create/token_create_test.go @@ -8,8 +8,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/command/acl/token/delete/token_delete_test.go b/command/acl/token/delete/token_delete_test.go index a6bf61f3c9..f2810d6329 100644 --- a/command/acl/token/delete/token_delete_test.go +++ b/command/acl/token/delete/token_delete_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/command/acl/token/list/token_list_test.go b/command/acl/token/list/token_list_test.go index 64693cae8b..240d8bdee8 100644 --- a/command/acl/token/list/token_list_test.go +++ b/command/acl/token/list/token_list_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/command/acl/token/read/token_read_test.go b/command/acl/token/read/token_read_test.go index 9d4629c14d..9cbdd66f92 100644 --- a/command/acl/token/read/token_read_test.go +++ b/command/acl/token/read/token_read_test.go @@ -9,8 +9,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/command/acl/token/update/token_update_test.go b/command/acl/token/update/token_update_test.go index bd4ec07821..8538226119 100644 --- a/command/acl/token/update/token_update_test.go +++ b/command/acl/token/update/token_update_test.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" "github.com/stretchr/testify/assert" ) diff --git a/command/connect/proxy/register_test.go b/command/connect/proxy/register_test.go index d94b7ac9c8..153b26e10f 100644 --- a/command/connect/proxy/register_test.go +++ b/command/connect/proxy/register_test.go @@ -6,8 +6,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/api" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/stretchr/testify/require" ) diff --git a/command/debug/debug_test.go b/command/debug/debug_test.go index fdf66be1a9..841a7da267 100644 --- a/command/debug/debug_test.go +++ b/command/debug/debug_test.go @@ -12,8 +12,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/logger" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil" + "github.com/hashicorp/consul/testrpc" "github.com/mitchellh/cli" ) diff --git a/connect/service_test.go b/connect/service_test.go index 392e74bd89..2d04d14c49 100644 --- a/connect/service_test.go +++ b/connect/service_test.go @@ -18,8 +18,8 @@ import ( "github.com/hashicorp/consul/agent" "github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/api" - "github.com/hashicorp/consul/testrpc" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/testrpc" "github.com/stretchr/testify/require" )