fix: lagoon routes json wildcards

Author: shreddedbacon

cmd/template_ingress_test.go

@@ -413,6 +413,25 @@ func TestTemplateRoutes(t *testing.T) {
 			templatePath: "testdata/output",
 			want:         "internal/testdata/basic/ingress-templates/test25-pathroutes",
 		},
+		{
+			name: "test25 check wildcard LAGOON_ROUTES_JSON",
+			args: testdata.GetSeedData(
+				testdata.TestData{
+					ProjectName:     "example-project",
+					EnvironmentName: "wildcardjson",
+					Branch:          "wildcardjson",
+					LagoonYAML:      "internal/testdata/node/lagoon.yml",
+					ProjectVariables: []lagoon.EnvironmentVariable{
+						{
+							Name:  "LAGOON_ROUTES_JSON",
+							Value: base64.StdEncoding.EncodeToString([]byte(`{"routes":[{"domain":"test1.example.com","wildcard":true,"service":"node","tls-acme":false,"monitoring-path":"/bypass-cache"}]}`)),
+							Scope: "build",
+						},
+					},
+				}, true),
+			templatePath: "testoutput",
+			want:         "internal/testdata/node/ingress-templates/ingress-24",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

internal/lagoon/routes.go

@@ -390,6 +390,7 @@ func handleAPIRoute(defaultIngressClass string, apiRoute RouteV2) (RouteV2, erro
 		if err := validation.IsDNS1123Subdomain(strings.ToLower(apiRoute.IngressName)); err != nil {
 			apiRoute.IngressName = fmt.Sprintf("%s-%s", apiRoute.IngressName[:len(apiRoute.IngressName)-10], helpers.GetMD5HashWithNewLine(apiRoute.Domain)[:5])
 		}
+		routeAdd.IngressName = apiRoute.IngressName
 	}
 
 	if apiRoute.RequestVerification != nil {

internal/lagoon/routes_test.go

@@ -672,7 +672,7 @@ func TestMergeRouteStructures(t *testing.T) {
 						AlternativeNames:    []string{},
 						Wildcard:            helpers.BoolPtr(true),
 						WildcardApex:        helpers.BoolPtr(true),
-						IngressName:         "example.com",
+						IngressName:         "wildcard-example.com",
 						RequestVerification: helpers.BoolPtr(false),
 					},
 					{
@@ -685,7 +685,7 @@ func TestMergeRouteStructures(t *testing.T) {
 						AlternativeNames:    []string{},
 						Wildcard:            helpers.BoolPtr(true),
 						WildcardApex:        helpers.BoolPtr(true),
-						IngressName:         "a.example.com",
+						IngressName:         "wildcard-a.example.com",
 						RequestVerification: helpers.BoolPtr(false),
 					},
 				},

internal/testdata/node/ingress-templates/ingress-24/test1.example.com.yaml

@@ -0,0 +1,58 @@
+---
+apiVersion: networking.k8s.io/v1
+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: wildcardjson
+    lagoon.sh/version: v2.7.x
+    monitor.stakater.com/enabled: "false"
+    monitor.stakater.com/overridePath: /bypass-cache
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+  creationTimestamp: null
+  labels:
+    activestandby.lagoon.sh/migrate: "false"
+    app.kubernetes.io/instance: wildcard-test1.example.com
+    app.kubernetes.io/managed-by: build-deploy-tool
+    app.kubernetes.io/name: custom-ingress
+    lagoon.sh/autogenerated: "false"
+    lagoon.sh/buildType: branch
+    lagoon.sh/environment: wildcardjson
+    lagoon.sh/environmentType: production
+    lagoon.sh/project: example-project
+    lagoon.sh/service: wildcard-test1.example.com
+    lagoon.sh/service-type: custom-ingress
+    lagoon.sh/template: custom-ingress-0.1.0
+  name: wildcard-test1.example.com
+spec:
+  rules:
+  - host: '*.test1.example.com'
+    http:
+      paths:
+      - backend:
+          service:
+            name: node
+            port:
+              name: http
+        path: /
+        pathType: Prefix
+  - host: test1.example.com
+    http:
+      paths:
+      - backend:
+          service:
+            name: node
+            port:
+              name: http
+        path: /
+        pathType: Prefix
+  tls:
+  - hosts:
+    - '*.test1.example.com'
+    - test1.example.com
+    secretName: wildcard-test1.example.com-tls
+status:
+  loadBalancer: {}