From 401b88b66aa295a30a7cd7e408b40536baa9ba74 Mon Sep 17 00:00:00 2001
From: Ben Jackson <shreddedbacon@users.noreply.github.com>
Date: Fri, 3 Nov 2023 08:40:19 +1100
Subject: [PATCH] fix: array in autogen cleanup, add test for polysite route
 (#250)

---
 cmd/template_autogen_ingress_test.go          | 19 ++++++++++++++++++
 legacy/build-deploy-docker-compose.sh         |  8 ++++----
 .../template-autogenerated/test25/lagoon.yml  | 13 ++++++------
 .../test26/docker-compose.yml                 | 20 +++++++++++++++++++
 .../template-autogenerated/test26/lagoon.yml  | 17 ++++++++++++++++
 5 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 test-resources/template-autogenerated/test26/docker-compose.yml
 create mode 100644 test-resources/template-autogenerated/test26/lagoon.yml

diff --git a/cmd/template_autogen_ingress_test.go b/cmd/template_autogen_ingress_test.go
index 9d9ffab9..bcd431dd 100644
--- a/cmd/template_autogen_ingress_test.go
+++ b/cmd/template_autogen_ingress_test.go
@@ -550,6 +550,25 @@ func TestAutogeneratedIngressGeneration(t *testing.T) {
 			emptyDir: true,
 			want:     "",
 		},
+		{
+			name: "test26 polysite autogenerated routes enabled globally but disabled by environment",
+			args: args{
+				alertContact:    "alertcontact",
+				statusPageID:    "statuspageid",
+				projectName:     "example-project",
+				environmentName: "main",
+				environmentType: "production",
+				buildType:       "branch",
+				lagoonVersion:   "v2.7.x",
+				branch:          "main",
+				projectVars:     `[{"name":"LAGOON_SYSTEM_ROUTER_PATTERN","value":"${service}-${project}-${environment}.example.com","scope":"internal_system"}]`,
+				envVars:         `[]`,
+				lagoonYAML:      "../test-resources/template-autogenerated/test26/lagoon.yml",
+				templatePath:    "../test-resources/template-autogenerated/output",
+			},
+			emptyDir: true,
+			want:     "",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
diff --git a/legacy/build-deploy-docker-compose.sh b/legacy/build-deploy-docker-compose.sh
index cec16b86..b6f54716 100755
--- a/legacy/build-deploy-docker-compose.sh
+++ b/legacy/build-deploy-docker-compose.sh
@@ -1106,11 +1106,11 @@ for AR in $AUTOGEN_ROUTES; do
   fi
   MATCHED_AUTOGEN=false
 done
-for DA in $DELETE_AUTOGEN; do
+for DA in ${!DELETE_AUTOGEN[@]}; do
   # delete any autogenerated ingress in the namespace as they are disabled
-  if kubectl -n ${NAMESPACE} get ingress ${DA} &> /dev/null; then
-    echo ">> Removing autogenerated ingress for ${DA} because it was disabled"
-    kubectl -n ${NAMESPACE} delete ingress ${DA}
+  if kubectl -n ${NAMESPACE} get ingress ${DELETE_AUTOGEN[$DA]} &> /dev/null; then
+    echo ">> Removing autogenerated ingress for ${DELETE_AUTOGEN[$DA]} because it was disabled"
+    kubectl -n ${NAMESPACE} delete ingress ${DELETE_AUTOGEN[$DA]}
   fi
 done
 
diff --git a/test-resources/template-autogenerated/test25/lagoon.yml b/test-resources/template-autogenerated/test25/lagoon.yml
index f39f216d..37d0d852 100644
--- a/test-resources/template-autogenerated/test25/lagoon.yml
+++ b/test-resources/template-autogenerated/test25/lagoon.yml
@@ -9,9 +9,10 @@ routes:
 environment_variables:
   git_sha: "true"
 
-environments:
-  main:
-    autogenerateRoutes: false
-    routes:
-      - node:
-          - example.com
+example-project:
+  environments:
+    main:
+      autogenerateRoutes: false
+      routes:
+        - node:
+            - example.com
diff --git a/test-resources/template-autogenerated/test26/docker-compose.yml b/test-resources/template-autogenerated/test26/docker-compose.yml
new file mode 100644
index 00000000..85386270
--- /dev/null
+++ b/test-resources/template-autogenerated/test26/docker-compose.yml
@@ -0,0 +1,20 @@
+version: '2'
+services:
+  node:
+    networks:
+      - amazeeio-network
+      - default
+    build:
+      context: .
+      dockerfile: node.dockerfile
+    labels:
+      lagoon.type: node
+    volumes:
+      - .:/app:delegated
+    environment:
+      - LAGOON_LOCALDEV_HTTP_PORT=3000
+      - LAGOON_ROUTE=http://node.docker.amazee.io
+
+networks:
+  amazeeio-network:
+    external: true
\ No newline at end of file
diff --git a/test-resources/template-autogenerated/test26/lagoon.yml b/test-resources/template-autogenerated/test26/lagoon.yml
new file mode 100644
index 00000000..f39f216d
--- /dev/null
+++ b/test-resources/template-autogenerated/test26/lagoon.yml
@@ -0,0 +1,17 @@
+docker-compose-yaml: ../test-resources/template-autogenerated/test6/docker-compose.yml
+
+routes:
+  autogenerate:
+    enabled: true
+    insecure: Redirect
+    allowPullrequests: false
+
+environment_variables:
+  git_sha: "true"
+
+environments:
+  main:
+    autogenerateRoutes: false
+    routes:
+      - node:
+          - example.com