addressed Ashwin's comment to refactor fixtures

hashicorp · Jul 27, 2023 · 5cb29f3 · 5cb29f3
1 parent 04758d7
commit 5cb29f3
Show file tree

Hide file tree

Showing 21 changed files with 14 additions and 14 deletions.
diff --git a/...ases/sameness-defaults/kustomization.yaml → ...es/sameness/default-ns/kustomization.yaml b/...ases/sameness-defaults/kustomization.yaml → ...es/sameness/default-ns/kustomization.yaml
diff --git a/...res/bases/sameness-defaults/sameness.yaml → ...s/bases/sameness/default-ns/sameness.yaml b/...res/bases/sameness-defaults/sameness.yaml → ...s/bases/sameness/default-ns/sameness.yaml
diff --git a/...s/fixtures/bases/sameness/intentions.yaml → ...ases/sameness/override-ns/intentions.yaml b/...s/fixtures/bases/sameness/intentions.yaml → ...ases/sameness/override-ns/intentions.yaml
diff --git a/...ixtures/bases/sameness/kustomization.yaml → ...s/sameness/override-ns/kustomization.yaml b/...ixtures/bases/sameness/kustomization.yaml → ...s/sameness/override-ns/kustomization.yaml
diff --git a/...s/sameness/payments-service-resolver.yaml → ...verride-ns/payments-service-resolver.yaml b/...s/sameness/payments-service-resolver.yaml → ...verride-ns/payments-service-resolver.yaml
diff --git a/...ures/bases/sameness/service-defaults.yaml → ...ameness/override-ns/service-defaults.yaml b/...ures/bases/sameness/service-defaults.yaml → ...ameness/override-ns/service-defaults.yaml
diff --git a/...bases/sameness-peering/kustomization.yaml → ...bases/sameness/peering/kustomization.yaml b/...bases/sameness-peering/kustomization.yaml → ...bases/sameness/peering/kustomization.yaml
diff --git a/...fixtures/bases/sameness-peering/mesh.yaml → ...fixtures/bases/sameness/peering/mesh.yaml b/...fixtures/bases/sameness-peering/mesh.yaml → ...fixtures/bases/sameness/peering/mesh.yaml
diff --git a/...services/ap1-partition/kustomization.yaml → ...services/ap1-partition/kustomization.yaml b/...services/ap1-partition/kustomization.yaml → ...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/...xported-services/ap1-partition/patch.yaml → ...xported-services/ap1-partition/patch.yaml b/...xported-services/ap1-partition/patch.yaml → ...xported-services/ap1-partition/patch.yaml
diff --git a/...ices/default-partition/kustomization.yaml → ...ices/default-partition/kustomization.yaml b/...ices/default-partition/kustomization.yaml → ...ices/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/...ted-services/default-partition/patch.yaml → ...ted-services/default-partition/patch.yaml b/...ted-services/default-partition/patch.yaml → ...ted-services/default-partition/patch.yaml
diff --git a/...ver-sameness/partition/kustomization.yaml → .../static-client/default/kustomization.yaml b/...ver-sameness/partition/kustomization.yaml → .../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
diff --git a/...static-client-sameness/default/patch.yaml → ...sameness/static-client/default/patch.yaml b/...static-client-sameness/default/patch.yaml → ...sameness/static-client/default/patch.yaml
diff --git a/...erver-sameness/default/kustomization.yaml → ...tatic-client/partition/kustomization.yaml b/...erver-sameness/default/kustomization.yaml → ...tatic-client/partition/kustomization.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MPL-2.0
 
 resources:
-  - ../../../bases/static-server
+  - ../../../../bases/static-client
 
 patchesStrategicMerge:
   - patch.yaml
diff --git a/...atic-client-sameness/partition/patch.yaml → ...meness/static-client/partition/patch.yaml b/...atic-client-sameness/partition/patch.yaml → ...meness/static-client/partition/patch.yaml
diff --git a/...lient-sameness/default/kustomization.yaml → .../static-server/default/kustomization.yaml b/...lient-sameness/default/kustomization.yaml → .../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
diff --git a/...static-server-sameness/default/patch.yaml → ...sameness/static-server/default/patch.yaml b/...static-server-sameness/default/patch.yaml → ...sameness/static-server/default/patch.yaml
diff --git a/...ent-sameness/partition/kustomization.yaml → ...tatic-server/partition/kustomization.yaml b/...ent-sameness/partition/kustomization.yaml → ...tatic-server/partition/kustomization.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MPL-2.0
 
 resources:
-  - ../../../bases/static-client
+  - ../../../../bases/static-server
 
 patchesStrategicMerge:
   - patch.yaml
diff --git a/...atic-server-sameness/partition/patch.yaml → ...meness/static-server/partition/patch.yaml b/...atic-server-sameness/partition/patch.yaml → ...meness/static-server/partition/patch.yaml
diff --git 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{})