test: update tests for disable request verifications

uselagoon · Jul 8, 2024 · 86e65b2 · 86e65b2
1 parent 314d841
commit 86e65b2
Show file tree

Hide file tree

Showing 63 changed files with 271 additions and 1 deletion.
diff --git a/internal/templating/ingress/templates_ingress.go b/internal/templating/ingress/templates_ingress.go
@@ -132,10 +132,22 @@ func GenerateIngressTemplate(
 		additionalAnnotations["nginx.ingress.kubernetes.io/ssl-redirect"] = "true"
 		additionalAnnotations["ingress.kubernetes.io/ssl-redirect"] = "true"
 	}
-	if lValues.EnvironmentType == "development" || *&route.Autogenerated == true {
+	if lValues.EnvironmentType == "development" || route.Autogenerated {
 		additionalAnnotations["nginx.ingress.kubernetes.io/server-snippet"] = "add_header X-Robots-Tag \"noindex, nofollow\";\n"
 	}
 
+	// if idling request verification is in the `.lagoon.yml` and true, add the annotation. this supports production and development environment types
+	// in the event that production environments support idling properly that option could be available to then
+	// idle standby environments or production environments generally in opensource lagoon
+	if route.RequestVerification != nil && *route.RequestVerification {
+		// @TODO: this will eventually be changed to a `lagoon.sh` instead of `amazee.io` namespaced annotation in the future once
+		// aergia is fully integrated into the uselagoon namespace
+		additionalAnnotations["idling.amazee.io/disable-request-verification"] = "true"
+	} else {
+		// otherwise force false
+		additionalAnnotations["idling.amazee.io/disable-request-verification"] = "false"
+	}
+
 	// check if a user has defined hsts configuration
 	if route.HSTSEnabled != nil && *route.HSTSEnabled {
 		hstsHeader := fmt.Sprintf("more_set_headers \"Strict-Transport-Security: max-age=%d", route.HSTSMaxAge)

diff --git a/internal/templating/ingress/templates_ingress_test.go b/internal/templating/ingress/templates_ingress_test.go
@@ -458,6 +458,45 @@ func TestGenerateKubeTemplate(t *testing.T) {
 			},
 			want: "test-resources/result-wildcard-ingress2.yaml",
 		},
+		{
+			name: "custom-ingress7",
+			args: args{
+				route: lagoon.RouteV2{
+					Domain:         "extra-long-name.a-really-long-name-that-should-truncate.www.example.com",
+					LagoonService:  "nginx",
+					MonitoringPath: "/",
+					Insecure:       helpers.StrPtr("Redirect"),
+					TLSAcme:        helpers.BoolPtr(true),
+					Migrate:        helpers.BoolPtr(false),
+					Annotations: map[string]string{
+						"custom-annotation": "custom annotation value",
+					},
+					Fastly: lagoon.Fastly{
+						Watch: false,
+					},
+					RequestVerification: helpers.BoolPtr(true),
+					IngressName:         "extra-long-name.a-really-long-name-that-should-truncate.www.example.com",
+				},
+				values: generator.BuildValues{
+					Project:         "example-project",
+					Environment:     "environment-with-really-really-reall-3fdb",
+					EnvironmentType: "development",
+					Namespace:       "myexample-project-environment-with-really-really-reall-3fdb",
+					BuildType:       "branch",
+					LagoonVersion:   "v2.x.x",
+					Kubernetes:      "lagoon.local",
+					Branch:          "environment-with-really-really-reall-3fdb",
+					Monitoring: generator.MonitoringConfig{
+						AlertContact: "abcdefg",
+						StatusPageID: "12345",
+						Enabled:      true,
+					},
+					Route: "https://extra-long-name.a-really-long-name-that-should-truncate.www.example.com/",
+				},
+				activeStandby: false,
+			},
+			want: "test-resources/result-custom-ingress7.yaml",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

diff --git a/internal/templating/ingress/test-resources/result-active-standby1.yaml b/internal/templating/ingress/test-resources/result-active-standby1.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     custom-annotation: custom annotation value
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: environment-with-really-really-reall-3fdb

diff --git a/internal/templating/ingress/test-resources/result-custom-ingress1.yaml b/internal/templating/ingress/test-resources/result-custom-ingress1.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     custom-annotation: custom annotation value
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: environment-with-really-really-reall-3fdb

diff --git a/internal/templating/ingress/test-resources/result-custom-ingress2.yaml b/internal/templating/ingress/test-resources/result-custom-ingress2.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     custom-annotation: custom annotation value
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: environment-with-really-really-reall-3fdb

diff --git a/internal/templating/ingress/test-resources/result-custom-ingress3.yaml b/internal/templating/ingress/test-resources/result-custom-ingress3.yaml
@@ -6,6 +6,7 @@ metadata:
     acme.cert-manager.io/http01-ingress-class: nginx
     custom-annotation: custom annotation value
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: environment-with-really-really-reall-3fdb

diff --git a/internal/templating/ingress/test-resources/result-custom-ingress4.yaml b/internal/templating/ingress/test-resources/result-custom-ingress4.yaml
@@ -6,6 +6,7 @@ metadata:
     acme.cert-manager.io/http01-ingress-class: nginx
     custom-annotation: custom annotation value
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: environment-with-really-really-reall-3fdb

diff --git a/internal/templating/ingress/test-resources/result-custom-ingress5.yaml b/internal/templating/ingress/test-resources/result-custom-ingress5.yaml
@@ -6,6 +6,7 @@ metadata:
     acme.cert-manager.io/http01-ingress-class: nginx
     custom-annotation: custom annotation value
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: environment-with-really-really-reall-3fdb

diff --git a/internal/templating/ingress/test-resources/result-custom-ingress6.yaml b/internal/templating/ingress/test-resources/result-custom-ingress6.yaml
@@ -6,6 +6,7 @@ metadata:
     acme.cert-manager.io/http01-ingress-class: nginx
     custom-annotation: custom annotation value
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: environment-with-really-really-reall-3fdb

diff --git a/internal/templating/ingress/test-resources/result-custom-ingress7.yaml b/internal/templating/ingress/test-resources/result-custom-ingress7.yaml
@@ -0,0 +1,47 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    custom-annotation: custom annotation value
+    fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "true"
+    ingress.kubernetes.io/ssl-redirect: "true"
+    kubernetes.io/tls-acme: "true"
+    lagoon.sh/branch: environment-with-really-really-reall-3fdb
+    lagoon.sh/version: v2.x.x
+    nginx.ingress.kubernetes.io/server-snippet: |
+      add_header X-Robots-Tag "noindex, nofollow";
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+  creationTimestamp: null
+  labels:
+    app.kubernetes.io/instance: extra-long-name-f6c8a
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: custom-ingress
+    helm.sh/chart: custom-ingress-0.1.0
+    lagoon.sh/autogenerated: "false"
+    lagoon.sh/buildType: branch
+    lagoon.sh/environment: environment-with-really-really-reall-3fdb
+    lagoon.sh/environmentType: development
+    lagoon.sh/project: example-project
+    lagoon.sh/service: extra-long-name-f6c8a
+    lagoon.sh/service-type: custom-ingress
+  name: extra-long-name.a-really-long-name-that-should-truncate.www.example.com
+spec:
+  rules:
+  - host: extra-long-name.a-really-long-name-that-should-truncate.www.example.com
+    http:
+      paths:
+      - backend:
+          service:
+            name: nginx
+            port:
+              name: http
+        path: /
+        pathType: Prefix
+  tls:
+  - hosts:
+    - extra-long-name.a-really-long-name-that-should-truncate.www.example.com
+    secretName: extra-long-name-f6c8a-tls
+status:
+  loadBalancer: {}
diff --git a/internal/templating/ingress/test-resources/result-wildcard-ingress1.yaml b/internal/templating/ingress/test-resources/result-wildcard-ingress1.yaml
@@ -6,6 +6,7 @@ metadata:
     acme.cert-manager.io/http01-ingress-class: nginx
     custom-annotation: custom annotation value
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "false"
     lagoon.sh/branch: environment

diff --git a/internal/templating/ingress/test-resources/result-wildcard-ingress2.yaml b/internal/templating/ingress/test-resources/result-wildcard-ingress2.yaml
@@ -6,6 +6,7 @@ metadata:
     acme.cert-manager.io/http01-ingress-class: nginx
     custom-annotation: custom annotation value
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "false"
     lagoon.sh/branch: environment

diff --git a/internal/testdata/complex/autogen-templates/ingress-1/nginx.yaml b/internal/testdata/complex/autogen-templates/ingress-1/nginx.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "false"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: drush-first

diff --git a/internal/testdata/complex/autogen-templates/ingress-2/nginx-php.yaml b/internal/testdata/complex/autogen-templates/ingress-2/nginx-php.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "false"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: feature/migration

diff --git a/internal/testdata/complex/autogen-templates/ingress-3/nginx.yaml b/internal/testdata/complex/autogen-templates/ingress-3/nginx.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "false"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: feature

diff --git a/internal/testdata/complex/ingress-templates/ingress-1/content.example.com.yaml b/internal/testdata/complex/ingress-templates/ingress-1/content.example.com.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "false"
     kubernetes.io/tls-acme: "false"
     lagoon.sh/branch: production

diff --git a/internal/testdata/nginxphp/autogen-templates/ingress-1/nginx.yaml b/internal/testdata/nginxphp/autogen-templates/ingress-1/nginx.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: main

diff --git a/internal/testdata/nginxphp/autogen-templates/ingress-2/nginx.yaml b/internal/testdata/nginxphp/autogen-templates/ingress-2/nginx.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: main

diff --git a/internal/testdata/nginxphp/autogen-templates/ingress-3/nginx-php.yaml b/internal/testdata/nginxphp/autogen-templates/ingress-3/nginx-php.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/prBaseBranch: main2

diff --git a/internal/testdata/node/autogen-templates/ingress-1/node.yaml b/internal/testdata/node/autogen-templates/ingress-1/node.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: main

diff --git a/internal/testdata/node/autogen-templates/ingress-10/node.yaml b/internal/testdata/node/autogen-templates/ingress-10/node.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "false"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: main

diff --git a/internal/testdata/node/autogen-templates/ingress-11/node.yaml b/internal/testdata/node/autogen-templates/ingress-11/node.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: main

diff --git a/internal/testdata/node/autogen-templates/ingress-12/node.yaml b/internal/testdata/node/autogen-templates/ingress-12/node.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "false"
     lagoon.sh/branch: main

diff --git a/internal/testdata/node/autogen-templates/ingress-13/node.yaml b/internal/testdata/node/autogen-templates/ingress-13/node.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "false"
     lagoon.sh/branch: main

diff --git a/internal/testdata/node/autogen-templates/ingress-14/node.yaml b/internal/testdata/node/autogen-templates/ingress-14/node.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: main

diff --git a/internal/testdata/node/autogen-templates/ingress-15/node.yaml b/internal/testdata/node/autogen-templates/ingress-15/node.yaml
@@ -0,0 +1,47 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "true"
+    ingress.kubernetes.io/ssl-redirect: "true"
+    kubernetes.io/tls-acme: "true"
+    lagoon.sh/branch: main
+    lagoon.sh/version: v2.7.x
+    monitor.stakater.com/enabled: "false"
+    nginx.ingress.kubernetes.io/server-snippet: |
+      add_header X-Robots-Tag "noindex, nofollow";
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+  creationTimestamp: null
+  labels:
+    app.kubernetes.io/instance: node
+    app.kubernetes.io/managed-by: Helm
+    app.kubernetes.io/name: autogenerated-ingress
+    helm.sh/chart: autogenerated-ingress-0.1.0
+    lagoon.sh/autogenerated: "true"
+    lagoon.sh/buildType: branch
+    lagoon.sh/environment: main
+    lagoon.sh/environmentType: production
+    lagoon.sh/project: example-project
+    lagoon.sh/service: node
+    lagoon.sh/service-type: node
+  name: node
+spec:
+  rules:
+  - host: node-example-project-main.example.com
+    http:
+      paths:
+      - backend:
+          service:
+            name: node
+            port:
+              name: http
+        path: /
+        pathType: Prefix
+  tls:
+  - hosts:
+    - node-example-project-main.example.com
+    secretName: node-tls
+status:
+  loadBalancer: {}
diff --git a/internal/testdata/node/autogen-templates/ingress-2/node.yaml b/internal/testdata/node/autogen-templates/ingress-2/node.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/prBaseBranch: main2

diff --git a/internal/testdata/node/autogen-templates/ingress-3/node.yaml b/internal/testdata/node/autogen-templates/ingress-3/node.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: main

diff --git a/internal/testdata/node/autogen-templates/ingress-4/node.yaml b/internal/testdata/node/autogen-templates/ingress-4/node.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: short-router-url-from-a-very-long-environment-name-like-this

diff --git a/internal/testdata/node/autogen-templates/ingress-5/node.yaml b/internal/testdata/node/autogen-templates/ingress-5/node.yaml
@@ -4,6 +4,7 @@ kind: Ingress
 metadata:
   annotations:
     fastly.amazee.io/watch: "false"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: main

diff --git a/internal/testdata/node/autogen-templates/ingress-6/node.yaml b/internal/testdata/node/autogen-templates/ingress-6/node.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     fastly.amazee.io/service-id: service-id
     fastly.amazee.io/watch: "true"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: main

diff --git a/internal/testdata/node/autogen-templates/ingress-7/node.yaml b/internal/testdata/node/autogen-templates/ingress-7/node.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     fastly.amazee.io/service-id: service-id
     fastly.amazee.io/watch: "true"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: main

diff --git a/internal/testdata/node/autogen-templates/ingress-8/node.yaml b/internal/testdata/node/autogen-templates/ingress-8/node.yaml
@@ -6,6 +6,7 @@ metadata:
     fastly.amazee.io/api-secret-name: fastly-api-secretname
     fastly.amazee.io/service-id: service-id
     fastly.amazee.io/watch: "true"
+    idling.amazee.io/disable-request-verification: "false"
     ingress.kubernetes.io/ssl-redirect: "true"
     kubernetes.io/tls-acme: "true"
     lagoon.sh/branch: main