From 5cb29f3b93a2219366aa830c6e829dcf1d0e3283 Mon Sep 17 00:00:00 2001 From: Michael Wilkerson Date: Wed, 26 Jul 2023 12:56:35 -0700 Subject: [PATCH] addressed Ashwin's comment to refactor fixtures --- .../default-ns}/kustomization.yaml | 0 .../default-ns}/sameness.yaml | 0 .../sameness/{ => override-ns}/intentions.yaml | 0 .../{ => override-ns}/kustomization.yaml | 0 .../payments-service-resolver.yaml | 0 .../{ => override-ns}/service-defaults.yaml | 0 .../peering}/kustomization.yaml | 0 .../peering}/mesh.yaml | 0 .../ap1-partition/kustomization.yaml | 2 +- .../exported-services}/ap1-partition/patch.yaml | 0 .../default-partition/kustomization.yaml | 2 +- .../default-partition/patch.yaml | 0 .../static-client/default}/kustomization.yaml | 2 +- .../static-client}/default/patch.yaml | 0 .../static-client/partition}/kustomization.yaml | 2 +- .../static-client}/partition/patch.yaml | 0 .../static-server}/default/kustomization.yaml | 2 +- .../static-server}/default/patch.yaml | 0 .../static-server}/partition/kustomization.yaml | 2 +- .../static-server}/partition/patch.yaml | 0 acceptance/tests/sameness/sameness_test.go | 16 ++++++++-------- 21 files changed, 14 insertions(+), 14 deletions(-) rename acceptance/tests/fixtures/bases/{sameness-defaults => sameness/default-ns}/kustomization.yaml (100%) rename acceptance/tests/fixtures/bases/{sameness-defaults => sameness/default-ns}/sameness.yaml (100%) rename acceptance/tests/fixtures/bases/sameness/{ => override-ns}/intentions.yaml (100%) rename acceptance/tests/fixtures/bases/sameness/{ => override-ns}/kustomization.yaml (100%) rename acceptance/tests/fixtures/bases/sameness/{ => override-ns}/payments-service-resolver.yaml (100%) rename acceptance/tests/fixtures/bases/sameness/{ => override-ns}/service-defaults.yaml (100%) rename acceptance/tests/fixtures/bases/{sameness-peering => sameness/peering}/kustomization.yaml (100%) rename acceptance/tests/fixtures/bases/{sameness-peering => sameness/peering}/mesh.yaml (100%) rename acceptance/tests/fixtures/cases/{sameness-exported-services => sameness/exported-services}/ap1-partition/kustomization.yaml (72%) rename acceptance/tests/fixtures/cases/{sameness-exported-services => sameness/exported-services}/ap1-partition/patch.yaml (100%) rename acceptance/tests/fixtures/cases/{sameness-exported-services => sameness/exported-services}/default-partition/kustomization.yaml (71%) rename acceptance/tests/fixtures/cases/{sameness-exported-services => sameness/exported-services}/default-partition/patch.yaml (100%) rename acceptance/tests/fixtures/cases/{static-server-sameness/partition => sameness/static-client/default}/kustomization.yaml (76%) rename acceptance/tests/fixtures/cases/{static-client-sameness => sameness/static-client}/default/patch.yaml (100%) rename acceptance/tests/fixtures/cases/{static-server-sameness/default => sameness/static-client/partition}/kustomization.yaml (76%) rename acceptance/tests/fixtures/cases/{static-client-sameness => sameness/static-client}/partition/patch.yaml (100%) rename acceptance/tests/fixtures/cases/{static-client-sameness => sameness/static-server}/default/kustomization.yaml (76%) rename acceptance/tests/fixtures/cases/{static-server-sameness => sameness/static-server}/default/patch.yaml (100%) rename acceptance/tests/fixtures/cases/{static-client-sameness => sameness/static-server}/partition/kustomization.yaml (76%) rename acceptance/tests/fixtures/cases/{static-server-sameness => sameness/static-server}/partition/patch.yaml (100%) diff --git a/acceptance/tests/fixtures/bases/sameness-defaults/kustomization.yaml b/acceptance/tests/fixtures/bases/sameness/default-ns/kustomization.yaml similarity index 100% rename from acceptance/tests/fixtures/bases/sameness-defaults/kustomization.yaml rename to acceptance/tests/fixtures/bases/sameness/default-ns/kustomization.yaml diff --git a/acceptance/tests/fixtures/bases/sameness-defaults/sameness.yaml b/acceptance/tests/fixtures/bases/sameness/default-ns/sameness.yaml similarity index 100% rename from acceptance/tests/fixtures/bases/sameness-defaults/sameness.yaml rename to acceptance/tests/fixtures/bases/sameness/default-ns/sameness.yaml diff --git a/acceptance/tests/fixtures/bases/sameness/intentions.yaml b/acceptance/tests/fixtures/bases/sameness/override-ns/intentions.yaml similarity index 100% rename from acceptance/tests/fixtures/bases/sameness/intentions.yaml rename to acceptance/tests/fixtures/bases/sameness/override-ns/intentions.yaml diff --git a/acceptance/tests/fixtures/bases/sameness/kustomization.yaml b/acceptance/tests/fixtures/bases/sameness/override-ns/kustomization.yaml similarity index 100% rename from acceptance/tests/fixtures/bases/sameness/kustomization.yaml rename to acceptance/tests/fixtures/bases/sameness/override-ns/kustomization.yaml diff --git a/acceptance/tests/fixtures/bases/sameness/payments-service-resolver.yaml b/acceptance/tests/fixtures/bases/sameness/override-ns/payments-service-resolver.yaml similarity index 100% rename from acceptance/tests/fixtures/bases/sameness/payments-service-resolver.yaml rename to acceptance/tests/fixtures/bases/sameness/override-ns/payments-service-resolver.yaml diff --git a/acceptance/tests/fixtures/bases/sameness/service-defaults.yaml b/acceptance/tests/fixtures/bases/sameness/override-ns/service-defaults.yaml similarity index 100% rename from acceptance/tests/fixtures/bases/sameness/service-defaults.yaml rename to acceptance/tests/fixtures/bases/sameness/override-ns/service-defaults.yaml diff --git a/acceptance/tests/fixtures/bases/sameness-peering/kustomization.yaml b/acceptance/tests/fixtures/bases/sameness/peering/kustomization.yaml similarity index 100% rename from acceptance/tests/fixtures/bases/sameness-peering/kustomization.yaml rename to acceptance/tests/fixtures/bases/sameness/peering/kustomization.yaml diff --git a/acceptance/tests/fixtures/bases/sameness-peering/mesh.yaml b/acceptance/tests/fixtures/bases/sameness/peering/mesh.yaml similarity index 100% rename from acceptance/tests/fixtures/bases/sameness-peering/mesh.yaml rename to acceptance/tests/fixtures/bases/sameness/peering/mesh.yaml diff --git a/acceptance/tests/fixtures/cases/sameness-exported-services/ap1-partition/kustomization.yaml b/acceptance/tests/fixtures/cases/sameness/exported-services/ap1-partition/kustomization.yaml similarity index 72% rename from acceptance/tests/fixtures/cases/sameness-exported-services/ap1-partition/kustomization.yaml rename to acceptance/tests/fixtures/cases/sameness/exported-services/ap1-partition/kustomization.yaml index b71d82fe70..90b0eee4bb 100644 --- a/acceptance/tests/fixtures/cases/sameness-exported-services/ap1-partition/kustomization.yaml +++ b/acceptance/tests/fixtures/cases/sameness/exported-services/ap1-partition/kustomization.yaml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MPL-2.0 resources: - - ../../../bases/exportedservices-ap1 + - ../../../../bases/exportedservices-ap1 patchesStrategicMerge: - patch.yaml diff --git a/acceptance/tests/fixtures/cases/sameness-exported-services/ap1-partition/patch.yaml b/acceptance/tests/fixtures/cases/sameness/exported-services/ap1-partition/patch.yaml similarity index 100% rename from acceptance/tests/fixtures/cases/sameness-exported-services/ap1-partition/patch.yaml rename to acceptance/tests/fixtures/cases/sameness/exported-services/ap1-partition/patch.yaml diff --git a/acceptance/tests/fixtures/cases/sameness-exported-services/default-partition/kustomization.yaml b/acceptance/tests/fixtures/cases/sameness/exported-services/default-partition/kustomization.yaml similarity index 71% rename from acceptance/tests/fixtures/cases/sameness-exported-services/default-partition/kustomization.yaml rename to acceptance/tests/fixtures/cases/sameness/exported-services/default-partition/kustomization.yaml index a175d8ece0..05de6151fc 100644 --- a/acceptance/tests/fixtures/cases/sameness-exported-services/default-partition/kustomization.yaml +++ b/acceptance/tests/fixtures/cases/sameness/exported-services/default-partition/kustomization.yaml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MPL-2.0 resources: - - ../../../bases/exportedservices-default + - ../../../../bases/exportedservices-default patchesStrategicMerge: - patch.yaml diff --git a/acceptance/tests/fixtures/cases/sameness-exported-services/default-partition/patch.yaml b/acceptance/tests/fixtures/cases/sameness/exported-services/default-partition/patch.yaml similarity index 100% rename from acceptance/tests/fixtures/cases/sameness-exported-services/default-partition/patch.yaml rename to acceptance/tests/fixtures/cases/sameness/exported-services/default-partition/patch.yaml diff --git a/acceptance/tests/fixtures/cases/static-server-sameness/partition/kustomization.yaml b/acceptance/tests/fixtures/cases/sameness/static-client/default/kustomization.yaml similarity index 76% rename from acceptance/tests/fixtures/cases/static-server-sameness/partition/kustomization.yaml rename to acceptance/tests/fixtures/cases/sameness/static-client/default/kustomization.yaml index 0775282c18..227f223c9f 100644 --- a/acceptance/tests/fixtures/cases/static-server-sameness/partition/kustomization.yaml +++ b/acceptance/tests/fixtures/cases/sameness/static-client/default/kustomization.yaml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MPL-2.0 resources: - - ../../../bases/static-server + - ../../../../bases/static-client patchesStrategicMerge: - patch.yaml \ No newline at end of file diff --git a/acceptance/tests/fixtures/cases/static-client-sameness/default/patch.yaml b/acceptance/tests/fixtures/cases/sameness/static-client/default/patch.yaml similarity index 100% rename from acceptance/tests/fixtures/cases/static-client-sameness/default/patch.yaml rename to acceptance/tests/fixtures/cases/sameness/static-client/default/patch.yaml diff --git a/acceptance/tests/fixtures/cases/static-server-sameness/default/kustomization.yaml b/acceptance/tests/fixtures/cases/sameness/static-client/partition/kustomization.yaml similarity index 76% rename from acceptance/tests/fixtures/cases/static-server-sameness/default/kustomization.yaml rename to acceptance/tests/fixtures/cases/sameness/static-client/partition/kustomization.yaml index 0775282c18..227f223c9f 100644 --- a/acceptance/tests/fixtures/cases/static-server-sameness/default/kustomization.yaml +++ b/acceptance/tests/fixtures/cases/sameness/static-client/partition/kustomization.yaml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MPL-2.0 resources: - - ../../../bases/static-server + - ../../../../bases/static-client patchesStrategicMerge: - patch.yaml \ No newline at end of file diff --git a/acceptance/tests/fixtures/cases/static-client-sameness/partition/patch.yaml b/acceptance/tests/fixtures/cases/sameness/static-client/partition/patch.yaml similarity index 100% rename from acceptance/tests/fixtures/cases/static-client-sameness/partition/patch.yaml rename to acceptance/tests/fixtures/cases/sameness/static-client/partition/patch.yaml diff --git a/acceptance/tests/fixtures/cases/static-client-sameness/default/kustomization.yaml b/acceptance/tests/fixtures/cases/sameness/static-server/default/kustomization.yaml similarity index 76% rename from acceptance/tests/fixtures/cases/static-client-sameness/default/kustomization.yaml rename to acceptance/tests/fixtures/cases/sameness/static-server/default/kustomization.yaml index 38bc36bffd..c15bfe7ba7 100644 --- a/acceptance/tests/fixtures/cases/static-client-sameness/default/kustomization.yaml +++ b/acceptance/tests/fixtures/cases/sameness/static-server/default/kustomization.yaml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MPL-2.0 resources: - - ../../../bases/static-client + - ../../../../bases/static-server patchesStrategicMerge: - patch.yaml \ No newline at end of file diff --git a/acceptance/tests/fixtures/cases/static-server-sameness/default/patch.yaml b/acceptance/tests/fixtures/cases/sameness/static-server/default/patch.yaml similarity index 100% rename from acceptance/tests/fixtures/cases/static-server-sameness/default/patch.yaml rename to acceptance/tests/fixtures/cases/sameness/static-server/default/patch.yaml diff --git a/acceptance/tests/fixtures/cases/static-client-sameness/partition/kustomization.yaml b/acceptance/tests/fixtures/cases/sameness/static-server/partition/kustomization.yaml similarity index 76% rename from acceptance/tests/fixtures/cases/static-client-sameness/partition/kustomization.yaml rename to acceptance/tests/fixtures/cases/sameness/static-server/partition/kustomization.yaml index 38bc36bffd..c15bfe7ba7 100644 --- a/acceptance/tests/fixtures/cases/static-client-sameness/partition/kustomization.yaml +++ b/acceptance/tests/fixtures/cases/sameness/static-server/partition/kustomization.yaml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MPL-2.0 resources: - - ../../../bases/static-client + - ../../../../bases/static-server patchesStrategicMerge: - patch.yaml \ No newline at end of file diff --git a/acceptance/tests/fixtures/cases/static-server-sameness/partition/patch.yaml b/acceptance/tests/fixtures/cases/sameness/static-server/partition/patch.yaml similarity index 100% rename from acceptance/tests/fixtures/cases/static-server-sameness/partition/patch.yaml rename to acceptance/tests/fixtures/cases/sameness/static-server/partition/patch.yaml diff --git a/acceptance/tests/sameness/sameness_test.go b/acceptance/tests/sameness/sameness_test.go index 719bb1f757..fdd97e8c75 100644 --- a/acceptance/tests/sameness/sameness_test.go +++ b/acceptance/tests/sameness/sameness_test.go @@ -271,8 +271,8 @@ func TestFailover_Connect(t *testing.T) { // Sameness Defaults need to be applied first so that the sameness group exists. applyResources(t, cfg.NoCleanupOnFailure, "../fixtures/bases/mesh-gateway", members[k].context.KubectlOptions(t)) - applyResources(t, cfg.NoCleanupOnFailure, "../fixtures/bases/sameness-defaults", members[k].context.KubectlOptions(t)) - applyResources(t, cfg.NoCleanupOnFailure, "../fixtures/bases/sameness", members[k].serverOpts) + applyResources(t, cfg.NoCleanupOnFailure, "../fixtures/bases/sameness/defaults-ns", members[k].context.KubectlOptions(t)) + applyResources(t, cfg.NoCleanupOnFailure, "../fixtures/bases/sameness/override-ns", members[k].serverOpts) // Only assign a client if the cluster is running a Consul server. if v.hasServer { @@ -284,15 +284,15 @@ func TestFailover_Connect(t *testing.T) { // Create static server deployments. logger.Log(t, "creating static-server and static-client deployments") k8s.DeployKustomize(t, members[keyPrimaryServer].serverOpts, cfg.NoCleanupOnFailure, cfg.DebugDirectory, - "../fixtures/cases/static-server-sameness/default") + "../fixtures/cases/sameness/static-server/default") k8s.DeployKustomize(t, members[keyPartition].serverOpts, cfg.NoCleanupOnFailure, cfg.DebugDirectory, - "../fixtures/cases/static-server-sameness/partition") + "../fixtures/cases/sameness/static-server/partition") // Create static client deployments. k8s.DeployKustomize(t, members[keyPrimaryServer].clientOpts, cfg.NoCleanupOnFailure, cfg.DebugDirectory, - "../fixtures/cases/static-client-sameness/default") + "../fixtures/cases/sameness/static-client/default") k8s.DeployKustomize(t, members[keyPartition].clientOpts, cfg.NoCleanupOnFailure, cfg.DebugDirectory, - "../fixtures/cases/static-client-sameness/partition") + "../fixtures/cases/sameness/static-client/partition") // Verify that both static-server and static-client have been injected and now have 2 containers in server cluster. // Also get the server IP @@ -323,8 +323,8 @@ func TestFailover_Connect(t *testing.T) { } logger.Log(t, "creating exported services") - applyResources(t, cfg.NoCleanupOnFailure, "../fixtures/cases/sameness-exported-services/default-partition", members[keyPrimaryServer].context.KubectlOptions(t)) - applyResources(t, cfg.NoCleanupOnFailure, "../fixtures/cases/sameness-exported-services/ap1-partition", members[keyPartition].context.KubectlOptions(t)) + applyResources(t, cfg.NoCleanupOnFailure, "../fixtures/cases/sameness/exported-services/default-partition", members[keyPrimaryServer].context.KubectlOptions(t)) + applyResources(t, cfg.NoCleanupOnFailure, "../fixtures/cases/sameness/exported-services/ap1-partition", members[keyPartition].context.KubectlOptions(t)) // Setup DNS. dnsService, err := members[keyPrimaryServer].context.KubernetesClient(t).CoreV1().Services("default").Get(context.Background(), fmt.Sprintf("%s-%s", releaseName, "consul-dns"), metav1.GetOptions{})