Merge branch 'main' into remove-tls-resources-if-false

Dockerfile

@@ -102,8 +102,6 @@ COPY legacy/scripts /kubectl-build-deploy/scripts
 
 COPY legacy/helmcharts  /kubectl-build-deploy/helmcharts
 
-ENV IMAGECACHE_REGISTRY=imagecache.amazeeio.cloud
-
 ENV DBAAS_OPERATOR_HTTP=dbaas.lagoon.svc:5000
 
 RUN curl -sSL https://github.com/uselagoon/lagoon-linter/releases/download/v0.8.0/lagoon-linter_0.8.0_linux_amd64.tar.gz \

cmd/tasks_run.go

@@ -4,13 +4,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
+	"strings"
+
 	"github.com/spf13/cobra"
 	"github.com/uselagoon/build-deploy-tool/internal/generator"
 	"github.com/uselagoon/build-deploy-tool/internal/lagoon"
 	"github.com/uselagoon/build-deploy-tool/internal/tasklib"
-	"io/ioutil"
-	"os"
-	"strings"
 )
 
 var runPreRollout, runPostRollout, outOfClusterConfig bool
@@ -31,7 +31,7 @@ var taskCmd = &cobra.Command{
 // unidleThenRun is a wrapper around 'runCleanTaskInEnvironment' used for pre-rollout tasks
 // We actually want to unidle the namespace before running pre-rollout tasks,
 // so we wrap the usual task runner before calling it.
-func unidleThenRun(namespace string, incoming lagoon.Task) error {
+func unidleThenRun(namespace string, prePost string, incoming lagoon.Task) error {
 	fmt.Printf("Unidling namespace with RequiresEnvironment: %v, ScaleMaxIterations:%v and ScaleWaitTime:%v\n", incoming.RequiresEnvironment, incoming.ScaleMaxIterations, incoming.ScaleWaitTime)
 	err := lagoon.UnidleNamespace(context.TODO(), namespace, incoming.ScaleMaxIterations, incoming.ScaleWaitTime)
 	if err != nil {
@@ -47,7 +47,7 @@ func unidleThenRun(namespace string, incoming lagoon.Task) error {
 			return fmt.Errorf("There was a problem when unidling the environment for pre-rollout tasks: %v", err.Error())
 		}
 	}
-	return runCleanTaskInEnvironment(namespace, incoming)
+	return runCleanTaskInEnvironment(namespace, prePost, incoming)
 }
 
 var tasksPreRun = &cobra.Command{
@@ -65,7 +65,7 @@ var tasksPreRun = &cobra.Command{
 		}
 		fmt.Println("Executing Pre-rollout Tasks")
 
-		taskIterator, err := iterateTaskGenerator(true, unidleThenRun, buildValues, true)
+		taskIterator, err := iterateTaskGenerator(true, unidleThenRun, buildValues, "Pre-Rollout", true)
 		if err != nil {
 			fmt.Println("Pre-rollout Tasks Failed with the following error: ", err.Error())
 			os.Exit(1)
@@ -97,7 +97,7 @@ var tasksPostRun = &cobra.Command{
 
 		fmt.Println("Executing Post-rollout Tasks")
 
-		taskIterator, err := iterateTaskGenerator(false, runCleanTaskInEnvironment, buildValues, true)
+		taskIterator, err := iterateTaskGenerator(false, runCleanTaskInEnvironment, buildValues, "Post-Rollout", true)
 		if err != nil {
 			fmt.Println("Pre-rollout Tasks Failed with the following error: ", err.Error())
 			os.Exit(1)
@@ -159,7 +159,7 @@ type iterateTaskFuncType func(tasklib.TaskEnvironment, []lagoon.Task) (bool, err
 // that lets the resulting function reference values as part of the closure, thereby cleaning up the definition a bit.
 // so, the variables passed into the factor (eg. allowDeployMissingErrors, etc.) determine the way the function behaves,
 // without needing to pass those into the call to the returned function itself.
-func iterateTaskGenerator(allowDeployMissingErrors bool, taskRunner runTaskInEnvironmentFuncType, buildValues generator.BuildValues, debug bool) (iterateTaskFuncType, error) {
+func iterateTaskGenerator(allowDeployMissingErrors bool, taskRunner runTaskInEnvironmentFuncType, buildValues generator.BuildValues, prePost string, debug bool) (iterateTaskFuncType, error) {
 	var retErr error
 	namespace := buildValues.Namespace
 	if namespace == "" {
@@ -168,7 +168,7 @@ func iterateTaskGenerator(allowDeployMissingErrors bool, taskRunner runTaskInEnv
 		if _, err := os.Stat(filename); errors.Is(err, os.ErrNotExist) {
 			retErr = fmt.Errorf("A target namespace is required to run pre/post-rollout tasks")
 		}
-		nsb, err := ioutil.ReadFile(filename)
+		nsb, err := os.ReadFile(filename)
 		if err != nil {
 			retErr = err
 		}
@@ -188,7 +188,7 @@ func iterateTaskGenerator(allowDeployMissingErrors bool, taskRunner runTaskInEnv
 				return true, err
 			}
 			if runTask {
-				err := taskRunner(namespace, task)
+				err := taskRunner(namespace, prePost, task)
 				if err != nil {
 					switch e := err.(type) {
 					case *lagoon.DeploymentMissingError:
@@ -242,12 +242,12 @@ func evaluateWhenConditionsForTaskInEnvironment(environment tasklib.TaskEnvironm
 	return retBool, nil
 }
 
-type runTaskInEnvironmentFuncType func(namespace string, incoming lagoon.Task) error
+type runTaskInEnvironmentFuncType func(namespace string, prePost string, incoming lagoon.Task) error
 
 // runCleanTaskInEnvironment implements runTaskInEnvironmentFuncType and will
 // 1. make sure the task we pass to the execution environment is free of any data we don't want (hence the new task)
 // 2. will actually execute the task in the environment.
-func runCleanTaskInEnvironment(namespace string, incoming lagoon.Task) error {
+func runCleanTaskInEnvironment(namespace string, prePost string, incoming lagoon.Task) error {
 	task := lagoon.NewTask()
 	task.Command = incoming.Command
 	task.Namespace = namespace
@@ -257,7 +257,7 @@ func runCleanTaskInEnvironment(namespace string, incoming lagoon.Task) error {
 	task.Name = incoming.Name
 	task.ScaleMaxIterations = incoming.ScaleMaxIterations
 	task.ScaleWaitTime = incoming.ScaleWaitTime
-	err := lagoon.ExecuteTaskInEnvironment(task)
+	err := lagoon.ExecuteTaskInEnvironment(task, prePost)
 	return err
 }
 

cmd/tasks_run_test.go

@@ -166,65 +166,70 @@ func Test_iterateTaskGenerator(t *testing.T) {
 	tests := []struct {
 		name      string
 		debug     bool
+		prePost   string
 		args      args
 		wantError bool
 	}{
 		{name: "Runs with no errors",
 			args: args{
 				allowDeployMissingErrors: true,
-				taskRunner: func(namespace string, incoming lagoon.Task) error {
+				taskRunner: func(namespace string, prePost string, incoming lagoon.Task) error {
 					return nil
 				},
 				tasks: []lagoon.Task{
 					{},
 				},
 				buildValues: generator.BuildValues{Namespace: "empty"},
 			},
+			prePost:   "PreRollout",
 			wantError: false,
 		},
 		{name: "Allows deploy missing errors and keeps rolling (pre rollout case)",
 			args: args{
 				allowDeployMissingErrors: true,
-				taskRunner: func(namespace string, incoming lagoon.Task) error {
+				taskRunner: func(namespace string, prePost string, incoming lagoon.Task) error {
 					return &lagoon.DeploymentMissingError{}
 				},
 				tasks: []lagoon.Task{
 					{},
 				},
 				buildValues: generator.BuildValues{Namespace: "empty"},
 			},
+			prePost:   "PreRollout",
 			wantError: false,
 		},
 		{name: "Does not allow deploy missing errors and stops with error (post rollout)",
 			args: args{
 				allowDeployMissingErrors: false,
-				taskRunner: func(namespace string, incoming lagoon.Task) error {
+				taskRunner: func(namespace string, prePost string, incoming lagoon.Task) error {
 					return &lagoon.DeploymentMissingError{}
 				},
 				tasks: []lagoon.Task{
 					{},
 				},
 				buildValues: generator.BuildValues{Namespace: "empty"},
 			},
+			prePost:   "PostRollout",
 			wantError: true,
 		},
 		{name: "Allows deploy missing errors but stops with any other error (pre rollout)",
 			args: args{
 				allowDeployMissingErrors: true,
-				taskRunner: func(namespace string, incoming lagoon.Task) error {
+				taskRunner: func(namespace string, prePost string, incoming lagoon.Task) error {
 					return &lagoon.PodScalingError{}
 				},
 				tasks: []lagoon.Task{
 					{},
 				},
 				buildValues: generator.BuildValues{Namespace: "empty"},
 			},
+			prePost:   "PostRollout",
 			wantError: true,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, _ := iterateTaskGenerator(tt.args.allowDeployMissingErrors, tt.args.taskRunner, tt.args.buildValues, tt.debug)
+			got, _ := iterateTaskGenerator(tt.args.allowDeployMissingErrors, tt.args.taskRunner, tt.args.buildValues, tt.prePost, tt.debug)
 			_, err := got(tasklib.TaskEnvironment{}, tt.args.tasks)
 
 			if tt.wantError && err == nil {

cmd/template_ingress_test.go

@@ -432,6 +432,44 @@ func TestTemplateRoutes(t *testing.T) {
 			},
 			want: "../test-resources/template-ingress/test20-results",
 		},
+		{
+			name: "test21 alternative names",
+			args: args{
+				alertContact:       "alertcontact",
+				statusPageID:       "statuspageid",
+				projectName:        "example-project",
+				environmentName:    "main",
+				environmentType:    "production",
+				buildType:          "branch",
+				standbyEnvironment: "main2",
+				lagoonVersion:      "v2.7.x",
+				branch:             "main",
+				projectVars:        `[{"name":"LAGOON_SYSTEM_ROUTER_PATTERN","value":"${service}-${project}-${environment}.example.com","scope":"internal_system"}]`,
+				envVars:            `[]`,
+				secretPrefix:       "fastly-api-",
+				lagoonYAML:         "../test-resources/template-ingress/test21/lagoon.yml",
+				templatePath:       "../test-resources/template-ingress/output",
+			},
+			want: "../test-resources/template-ingress/test21-results",
+		},
+		{
+			name: "test22 check wildcard",
+			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-ingress/test22/lagoon.yml",
+				templatePath:    "../test-resources/template-ingress/output",
+			},
+			want: "../test-resources/template-ingress/test22-results",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

internal/generator/ingress.go

@@ -76,7 +76,10 @@ func generateRoutes(
 		// generate the templates for these independently of any previously generated routes,
 		// this WILL overwrite previously created templates ensuring that anything defined in the `production_routes`
 		// section are created correctly ensuring active/standby will work
-		*activeStanbyRoutes = generateActiveStandbyRoutes(lagoonEnvVars, lYAML, buildValues)
+		*activeStanbyRoutes, err = generateActiveStandbyRoutes(lagoonEnvVars, lYAML, buildValues)
+		if err != nil {
+			return "", []string{}, []string{}, fmt.Errorf("couldn't generate and merge routes: %v", err)
+		}
 		// get the first route from the list of routes, replace the previous one if necessary
 		if len(activeStanbyRoutes.Routes) > 0 {
 			// if primary != "" {
@@ -244,14 +247,17 @@ func generateActiveStandbyRoutes(
 	envVars []lagoon.EnvironmentVariable,
 	lagoonYAML lagoon.YAML,
 	buildValues BuildValues,
-) lagoon.RoutesV2 {
+) (lagoon.RoutesV2, error) {
 	activeStanbyRoutes := &lagoon.RoutesV2{}
 	if lagoonYAML.ProductionRoutes != nil {
 		if buildValues.IsActiveEnvironment == true {
 			if lagoonYAML.ProductionRoutes.Active != nil {
 				if lagoonYAML.ProductionRoutes.Active.Routes != nil {
 					for _, routeMap := range lagoonYAML.ProductionRoutes.Active.Routes {
-						lagoon.GenerateRoutesV2(activeStanbyRoutes, routeMap, envVars, buildValues.IngressClass, buildValues.FastlyAPISecretPrefix, true)
+						err := lagoon.GenerateRoutesV2(activeStanbyRoutes, routeMap, envVars, buildValues.IngressClass, buildValues.FastlyAPISecretPrefix, true)
+						if err != nil {
+							return *activeStanbyRoutes, err
+						}
 					}
 				}
 			}
@@ -260,13 +266,16 @@ func generateActiveStandbyRoutes(
 			if lagoonYAML.ProductionRoutes.Standby != nil {
 				if lagoonYAML.ProductionRoutes.Standby.Routes != nil {
 					for _, routeMap := range lagoonYAML.ProductionRoutes.Standby.Routes {
-						lagoon.GenerateRoutesV2(activeStanbyRoutes, routeMap, envVars, buildValues.IngressClass, buildValues.FastlyAPISecretPrefix, true)
+						err := lagoon.GenerateRoutesV2(activeStanbyRoutes, routeMap, envVars, buildValues.IngressClass, buildValues.FastlyAPISecretPrefix, true)
+						if err != nil {
+							return *activeStanbyRoutes, err
+						}
 					}
 				}
 			}
 		}
 	}
-	return *activeStanbyRoutes
+	return *activeStanbyRoutes, nil
 }
 
 // getRoutesFromEnvVar will collect the value of the LAGOON_ROUTES_JSON
@@ -305,9 +314,15 @@ func generateAndMerge(
 
 	// otherwise it just uses the default environment name
 	for _, routeMap := range lagoonYAML.Environments[buildValues.Branch].Routes {
-		lagoon.GenerateRoutesV2(n, routeMap, envVars, buildValues.IngressClass, buildValues.FastlyAPISecretPrefix, false)
+		err := lagoon.GenerateRoutesV2(n, routeMap, envVars, buildValues.IngressClass, buildValues.FastlyAPISecretPrefix, false)
+		if err != nil {
+			return *n, err
+		}
 	}
 	// merge routes from the API on top of the routes from the `.lagoon.yml`
-	mainRoutes := lagoon.MergeRoutesV2(*n, api, envVars, buildValues.IngressClass, buildValues.FastlyAPISecretPrefix)
+	mainRoutes, err := lagoon.MergeRoutesV2(*n, api, envVars, buildValues.IngressClass, buildValues.FastlyAPISecretPrefix)
+	if err != nil {
+		return *n, err
+	}
 	return mainRoutes, nil
 }