feat: clean up unused services and resources

.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_dbaas.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
-	generator "github.com/uselagoon/build-deploy-tool/internal/generator"
+	"github.com/uselagoon/build-deploy-tool/internal/identify"
 )
 
 // this is an intermediate helper command while transitioning from bash to go
@@ -14,11 +14,11 @@ var dbaasIdentify = &cobra.Command{
 	Aliases: []string{"db", "d"},
 	Short:   "Identify if any dbaas consumers are created",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		generator, err := generator.GenerateInput(*rootCmd, false)
+		generator, err := GenerateInput(*rootCmd, false)
 		if err != nil {
 			return err
 		}
-		dbaasConsumers, err := IdentifyDBaaSConsumers(generator)
+		dbaasConsumers, err := identify.IdentifyDBaaSConsumers(generator)
 		if err != nil {
 			return err
 		}
@@ -28,19 +28,3 @@ var dbaasIdentify = &cobra.Command{
 		return nil
 	},
 }
-
-func IdentifyDBaaSConsumers(g generator.GeneratorInput) ([]string, error) {
-	lagoonBuild, err := generator.NewGenerator(
-		g,
-	)
-	if err != nil {
-		return nil, err
-	}
-	ret := []string{}
-	for _, svc := range lagoonBuild.BuildValues.Services {
-		if svc.IsDBaaS || svc.IsSingle {
-			ret = append(ret, fmt.Sprintf("%s:%s", svc.Name, svc.Type))
-		}
-	}
-	return ret, nil
-}

cmd/identify_feature.go

@@ -14,7 +14,7 @@ var featureFlagIdentify = &cobra.Command{
 	Aliases: []string{"f"},
 	Short:   "Identify if a feature flag has been enabled",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		generator, err := generator.GenerateInput(*rootCmd, false)
+		generator, err := GenerateInput(*rootCmd, false)
 		if err != nil {
 			return err
 		}

cmd/identify_feature_test.go

@@ -4,6 +4,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/uselagoon/build-deploy-tool/internal/generator"
 	"github.com/uselagoon/build-deploy-tool/internal/helpers"
 	"github.com/uselagoon/build-deploy-tool/internal/lagoon"
 	"github.com/uselagoon/build-deploy-tool/internal/testdata"
@@ -14,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",
@@ -39,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",
@@ -59,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",
@@ -72,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",
@@ -91,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",
@@ -163,8 +159,11 @@ 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
-			generator, err := testdata.SetupEnvironment(*rootCmd, savedTemplates, tt.args)
+			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.go

@@ -13,7 +13,7 @@ var imageBuildIdentify = &cobra.Command{
 	Aliases: []string{"image-build", "img-build", "ib"},
 	Short:   "Identify the configuration for building images for a Lagoon build",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		gen, err := generator.GenerateInput(*rootCmd, false)
+		gen, err := GenerateInput(*rootCmd, false)
 		if err != nil {
 			return 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(*rootCmd, 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.go

@@ -19,7 +19,7 @@ var primaryIngressIdentify = &cobra.Command{
 	Aliases: []string{"pi"},
 	Short:   "Identify the primary ingress for a specific environment",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		generator, err := generator.GenerateInput(*rootCmd, false)
+		generator, err := GenerateInput(*rootCmd, false)
 		if err != nil {
 			return err
 		}
@@ -37,7 +37,7 @@ var ingressIdentify = &cobra.Command{
 	Aliases: []string{"i"},
 	Short:   "Identify all ingress for a specific environment",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		generator, err := generator.GenerateInput(*rootCmd, false)
+		generator, err := GenerateInput(*rootCmd, false)
 		if err != nil {
 			return err
 		}
@@ -73,7 +73,7 @@ var autogenIngressIdentify = &cobra.Command{
 	Aliases: []string{"ci"},
 	Short:   "Identify all created ingress object names for a specific environment",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		generator, err := generator.GenerateInput(*rootCmd, false)
+		generator, err := GenerateInput(*rootCmd, false)
 		if err != nil {
 			return err
 		}