From 6a9739ad7eaa3690824053cb5319bdb2e617b67f Mon Sep 17 00:00:00 2001 From: cskh Date: Wed, 19 Oct 2022 10:36:35 -0400 Subject: [PATCH] chore: fix the module path to align with the code structure (#15053) --- test/integration/consul-container/go.mod | 2 +- test/integration/consul-container/libs/cluster/cluster.go | 2 +- .../consul-container/libs/node/consul-container.go | 2 +- test/integration/consul-container/metrics/leader_test.go | 6 +++--- .../consul-container/upgrade/healthcheck_test.go | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod index 917e708e05..4f282f40be 100644 --- a/test/integration/consul-container/go.mod +++ b/test/integration/consul-container/go.mod @@ -1,4 +1,4 @@ -module github.com/hashicorp/consul/integration/consul-container +module github.com/hashicorp/consul/test/integration/consul-container go 1.18 diff --git a/test/integration/consul-container/libs/cluster/cluster.go b/test/integration/consul-container/libs/cluster/cluster.go index 46fd18d6c6..89b7fac9ef 100644 --- a/test/integration/consul-container/libs/cluster/cluster.go +++ b/test/integration/consul-container/libs/cluster/cluster.go @@ -10,8 +10,8 @@ import ( "time" "github.com/hashicorp/consul/api" - "github.com/hashicorp/consul/integration/consul-container/libs/node" "github.com/hashicorp/consul/sdk/testutil/retry" + "github.com/hashicorp/consul/test/integration/consul-container/libs/node" "github.com/stretchr/testify/require" ) diff --git a/test/integration/consul-container/libs/node/consul-container.go b/test/integration/consul-container/libs/node/consul-container.go index 182f2451e9..1fb3d2df9c 100644 --- a/test/integration/consul-container/libs/node/consul-container.go +++ b/test/integration/consul-container/libs/node/consul-container.go @@ -14,7 +14,7 @@ import ( "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" - "github.com/hashicorp/consul/integration/consul-container/libs/utils" + "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" ) const bootLogLine = "Consul agent running" diff --git a/test/integration/consul-container/metrics/leader_test.go b/test/integration/consul-container/metrics/leader_test.go index 08cf0e392d..21200de8d9 100644 --- a/test/integration/consul-container/metrics/leader_test.go +++ b/test/integration/consul-container/metrics/leader_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/require" - libcluster "github.com/hashicorp/consul/integration/consul-container/libs/cluster" - "github.com/hashicorp/consul/integration/consul-container/libs/node" - "github.com/hashicorp/consul/integration/consul-container/libs/utils" + libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster" + "github.com/hashicorp/consul/test/integration/consul-container/libs/node" + "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" ) // Given a 3-server cluster, when the leader is elected, then leader's isLeader is 1 and non-leader's 0 diff --git a/test/integration/consul-container/upgrade/healthcheck_test.go b/test/integration/consul-container/upgrade/healthcheck_test.go index 7cc88ad6e6..8bbd036540 100644 --- a/test/integration/consul-container/upgrade/healthcheck_test.go +++ b/test/integration/consul-container/upgrade/healthcheck_test.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/consul/api" - libcluster "github.com/hashicorp/consul/integration/consul-container/libs/cluster" - "github.com/hashicorp/consul/integration/consul-container/libs/node" - "github.com/hashicorp/consul/integration/consul-container/libs/utils" + libcluster "github.com/hashicorp/consul/test/integration/consul-container/libs/cluster" + "github.com/hashicorp/consul/test/integration/consul-container/libs/node" + "github.com/hashicorp/consul/test/integration/consul-container/libs/utils" ) // Test health check GRPC call using Target Servers and Latest GA Clients