test: use make test and adjust output locations

Author: shreddedbacon

.github/workflows/test.yaml

@@ -12,4 +12,4 @@ jobs:
         go-version: '1.23'
         cache-dependency-path: ./go.mod
     - name: Run Tests
-      run: go test -v ./...
+      run: make test

cmd/identify_feature_test.go

@@ -15,13 +15,12 @@ import (
 
 func TestIdentifyFeatureFlag(t *testing.T) {
 	tests := []struct {
-		name         string
-		args         testdata.TestData
-		templatePath string
-		varName      string
-		vars         []helpers.EnvironmentVariable
-		want         string
-		wantErr      bool
+		name    string
+		args    testdata.TestData
+		varName string
+		vars    []helpers.EnvironmentVariable
+		want    string
+		wantErr bool
 	}{
 		{
 			name:    "test1 check if flag is defined in lagoon project variables",
@@ -40,8 +39,7 @@ func TestIdentifyFeatureFlag(t *testing.T) {
 						},
 					},
 				}, true),
-			templatePath: "testoutput",
-			want:         "enabled",
+			want: "enabled",
 		},
 		{
 			name:    "test2 check if flag is defined in lagoon environment variables",
@@ -60,8 +58,7 @@ func TestIdentifyFeatureFlag(t *testing.T) {
 						},
 					},
 				}, true),
-			templatePath: "testoutput",
-			want:         "enabled",
+			want: "enabled",
 		},
 		{
 			name:    "test3 check if force flag is defined in build variables",
@@ -73,7 +70,6 @@ func TestIdentifyFeatureFlag(t *testing.T) {
 					Branch:          "main",
 					LagoonYAML:      "internal/testdata/node/lagoon.yml",
 				}, true),
-			templatePath: "testoutput",
 			vars: []helpers.EnvironmentVariable{
 				{
 					Name:  "LAGOON_FEATURE_FLAG_FORCE_ROOTLESS_WORKLOAD",
@@ -92,7 +88,6 @@ func TestIdentifyFeatureFlag(t *testing.T) {
 					Branch:          "main",
 					LagoonYAML:      "internal/testdata/node/lagoon.yml",
 				}, true),
-			templatePath: "testoutput",
 			vars: []helpers.EnvironmentVariable{
 				{
 					Name:  "LAGOON_FEATURE_FLAG_FORCE_ROOTLESS_WORKLOAD",
@@ -164,7 +159,10 @@ func TestIdentifyFeatureFlag(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			helpers.UnsetEnvVars(tt.vars) //unset variables before running tests
 			// set the environment variables from args
-			savedTemplates := tt.templatePath
+			savedTemplates, err := os.MkdirTemp("", "testoutput")
+			if err != nil {
+				t.Errorf("%v", err)
+			}
 			generator, err := testdata.SetupEnvironment(generator.GeneratorInput{}, savedTemplates, tt.args)
 			if err != nil {
 				t.Errorf("%v", err)

cmd/identify_imagebuild_test.go

@@ -819,15 +819,13 @@ func TestImageBuildConfigurationIdentification(t *testing.T) {
 				}
 			}
 			// set the environment variables from args
-			savedTemplates := "testoutput"
-			generator, err := testdata.SetupEnvironment(generator.GeneratorInput{}, savedTemplates, tt.args)
+			savedTemplates, err := os.MkdirTemp("", "testoutput")
 			if err != nil {
 				t.Errorf("%v", err)
 			}
-
-			err = os.MkdirAll(savedTemplates, 0755)
+			generator, err := testdata.SetupEnvironment(generator.GeneratorInput{}, savedTemplates, tt.args)
 			if err != nil {
-				t.Errorf("couldn't create directory %v: %v", savedTemplates, err)
+				t.Errorf("%v", err)
 			}
 
 			defer os.RemoveAll(savedTemplates)

cmd/identify_ingress_test.go

@@ -16,10 +16,9 @@ import (
 
 func TestIdentifyNativeCronjobs(t *testing.T) {
 	tests := []struct {
-		name         string
-		args         testdata.TestData
-		templatePath string
-		want         string
+		name string
+		args testdata.TestData
+		want string
 	}{
 		{
 			name: "test1 basic deployment",
@@ -30,8 +29,7 @@ func TestIdentifyNativeCronjobs(t *testing.T) {
 					Branch:          "main",
 					LagoonYAML:      "internal/testdata/node/lagoon.yml",
 				}, true),
-			templatePath: "testoutput",
-			want:         "[]",
+			want: "[]",
 		},
 		{
 			name: "test2a nginx-php deployment",
@@ -42,8 +40,7 @@ func TestIdentifyNativeCronjobs(t *testing.T) {
 					Branch:          "main",
 					LagoonYAML:      "internal/testdata/complex/lagoon.yml",
 				}, true),
-			templatePath: "testoutput",
-			want:         `["cronjob-cli-drush-cron2"]`,
+			want: `["cronjob-cli-drush-cron2"]`,
 		},
 		{
 			name: "test2b nginx-php deployment - rootless",
@@ -61,23 +58,20 @@ func TestIdentifyNativeCronjobs(t *testing.T) {
 						},
 					},
 				}, true),
-			templatePath: "testoutput",
-			want:         `["cronjob-cli-drush-cron2"]`,
+			want: `["cronjob-cli-drush-cron2"]`,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			helpers.UnsetEnvVars(nil) //unset variables before running tests
 			// set the environment variables from args
-			savedTemplates := tt.templatePath
-			generator, err := testdata.SetupEnvironment(generator.GeneratorInput{}, savedTemplates, tt.args)
+			savedTemplates, err := os.MkdirTemp("", "testoutput")
 			if err != nil {
 				t.Errorf("%v", err)
 			}
-
-			err = os.MkdirAll(savedTemplates, 0755)
+			generator, err := testdata.SetupEnvironment(generator.GeneratorInput{}, savedTemplates, tt.args)
 			if err != nil {
-				t.Errorf("couldn't create directory %v: %v", savedTemplates, err)
+				t.Errorf("%v", err)
 			}
 
 			defer os.RemoveAll(savedTemplates)

cmd/identify_native_cronjobs_test.go

@@ -179,7 +179,7 @@ func init() {
 func initConfig() {
 }
 
-// helper function that reads flag overrides and retruns a generated input dataset
+// helper function that reads flag overrides and returns a generated input dataset
 // this is called from within the main environment setup helper function
 func GenerateInput(rootCmd cobra.Command, debug bool) (generator.GeneratorInput, error) {
 	lagoonYAML, err := rootCmd.PersistentFlags().GetString("lagoon-yml")