Skip to content

Commit dd40431

Browse files
committed
refactor(test): change testdata setup for future refactoring
1 parent 110aff7 commit dd40431

26 files changed

+176
-170
lines changed

cmd/identify_dbaas.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var dbaasIdentify = &cobra.Command{
1414
Aliases: []string{"db", "d"},
1515
Short: "Identify if any dbaas consumers are created",
1616
RunE: func(cmd *cobra.Command, args []string) error {
17-
generator, err := generator.GenerateInput(*rootCmd, false)
17+
generator, err := GenerateInput(*rootCmd, false)
1818
if err != nil {
1919
return err
2020
}

cmd/identify_dbaas_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"testing"
77

88
"github.com/uselagoon/build-deploy-tool/internal/dbaasclient"
9+
"github.com/uselagoon/build-deploy-tool/internal/generator"
910
"github.com/uselagoon/build-deploy-tool/internal/helpers"
1011
"github.com/uselagoon/build-deploy-tool/internal/lagoon"
1112
"github.com/uselagoon/build-deploy-tool/internal/testdata"
@@ -105,7 +106,7 @@ func TestIdentifyDBaaSConsumers(t *testing.T) {
105106
for _, tt := range tests {
106107
t.Run(tt.name, func(t *testing.T) {
107108
savedTemplates := tt.templatePath
108-
generator, err := testdata.SetupEnvironment(*rootCmd, savedTemplates, tt.args)
109+
generator, err := testdata.SetupEnvironment(generator.GeneratorInput{}, savedTemplates, tt.args)
109110
if err != nil {
110111
t.Errorf("%v", err)
111112
}

cmd/identify_feature.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var featureFlagIdentify = &cobra.Command{
1414
Aliases: []string{"f"},
1515
Short: "Identify if a feature flag has been enabled",
1616
RunE: func(cmd *cobra.Command, args []string) error {
17-
generator, err := generator.GenerateInput(*rootCmd, false)
17+
generator, err := GenerateInput(*rootCmd, false)
1818
if err != nil {
1919
return err
2020
}

cmd/identify_feature_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"os"
55
"testing"
66

7+
"github.com/uselagoon/build-deploy-tool/internal/generator"
78
"github.com/uselagoon/build-deploy-tool/internal/helpers"
89
"github.com/uselagoon/build-deploy-tool/internal/lagoon"
910
"github.com/uselagoon/build-deploy-tool/internal/testdata"
@@ -164,7 +165,7 @@ func TestIdentifyFeatureFlag(t *testing.T) {
164165
helpers.UnsetEnvVars(tt.vars) //unset variables before running tests
165166
// set the environment variables from args
166167
savedTemplates := tt.templatePath
167-
generator, err := testdata.SetupEnvironment(*rootCmd, savedTemplates, tt.args)
168+
generator, err := testdata.SetupEnvironment(generator.GeneratorInput{}, savedTemplates, tt.args)
168169
if err != nil {
169170
t.Errorf("%v", err)
170171
}

cmd/identify_imagebuild.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var imageBuildIdentify = &cobra.Command{
1313
Aliases: []string{"image-build", "img-build", "ib"},
1414
Short: "Identify the configuration for building images for a Lagoon build",
1515
RunE: func(cmd *cobra.Command, args []string) error {
16-
gen, err := generator.GenerateInput(*rootCmd, false)
16+
gen, err := GenerateInput(*rootCmd, false)
1717
if err != nil {
1818
return err
1919
}

cmd/identify_imagebuild_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -820,7 +820,7 @@ func TestImageBuildConfigurationIdentification(t *testing.T) {
820820
}
821821
// set the environment variables from args
822822
savedTemplates := "testoutput"
823-
generator, err := testdata.SetupEnvironment(*rootCmd, savedTemplates, tt.args)
823+
generator, err := testdata.SetupEnvironment(generator.GeneratorInput{}, savedTemplates, tt.args)
824824
if err != nil {
825825
t.Errorf("%v", err)
826826
}

cmd/identify_ingress.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var primaryIngressIdentify = &cobra.Command{
1919
Aliases: []string{"pi"},
2020
Short: "Identify the primary ingress for a specific environment",
2121
RunE: func(cmd *cobra.Command, args []string) error {
22-
generator, err := generator.GenerateInput(*rootCmd, false)
22+
generator, err := GenerateInput(*rootCmd, false)
2323
if err != nil {
2424
return err
2525
}
@@ -37,7 +37,7 @@ var ingressIdentify = &cobra.Command{
3737
Aliases: []string{"i"},
3838
Short: "Identify all ingress for a specific environment",
3939
RunE: func(cmd *cobra.Command, args []string) error {
40-
generator, err := generator.GenerateInput(*rootCmd, false)
40+
generator, err := GenerateInput(*rootCmd, false)
4141
if err != nil {
4242
return err
4343
}
@@ -73,7 +73,7 @@ var autogenIngressIdentify = &cobra.Command{
7373
Aliases: []string{"ci"},
7474
Short: "Identify all created ingress object names for a specific environment",
7575
RunE: func(cmd *cobra.Command, args []string) error {
76-
generator, err := generator.GenerateInput(*rootCmd, false)
76+
generator, err := GenerateInput(*rootCmd, false)
7777
if err != nil {
7878
return err
7979
}

cmd/identify_ingress_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"reflect"
66
"testing"
77

8+
"github.com/uselagoon/build-deploy-tool/internal/generator"
89
"github.com/uselagoon/build-deploy-tool/internal/helpers"
910
"github.com/uselagoon/build-deploy-tool/internal/lagoon"
1011
"github.com/uselagoon/build-deploy-tool/internal/testdata"
@@ -352,7 +353,7 @@ func TestIdentifyRoute(t *testing.T) {
352353
helpers.UnsetEnvVars(nil) //unset variables before running tests
353354
// set the environment variables from args
354355
savedTemplates := tt.templatePath
355-
generator, err := testdata.SetupEnvironment(*rootCmd, savedTemplates, tt.args)
356+
generator, err := testdata.SetupEnvironment(generator.GeneratorInput{}, savedTemplates, tt.args)
356357
if err != nil {
357358
t.Errorf("%v", err)
358359
}
@@ -506,7 +507,7 @@ func TestCreatedIngressIdentification(t *testing.T) {
506507
t.Run(tt.name, func(t *testing.T) {
507508
// set the environment variables from args
508509
savedTemplates := tt.templatePath
509-
generator, err := testdata.SetupEnvironment(*rootCmd, savedTemplates, tt.args)
510+
generator, err := testdata.SetupEnvironment(generator.GeneratorInput{}, savedTemplates, tt.args)
510511
if err != nil {
511512
t.Errorf("%v", err)
512513
}

cmd/identify_native_cronjobs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var nativeCronjobsIdentify = &cobra.Command{
1313
Aliases: []string{"nc"},
1414
Short: "Identify any native cronjobs for a specific environment",
1515
RunE: func(cmd *cobra.Command, args []string) error {
16-
generator, err := generator.GenerateInput(*rootCmd, false)
16+
generator, err := GenerateInput(*rootCmd, false)
1717
if err != nil {
1818
return err
1919
}

cmd/identify_native_cronjobs_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"testing"
66

77
"github.com/uselagoon/build-deploy-tool/internal/dbaasclient"
8+
"github.com/uselagoon/build-deploy-tool/internal/generator"
89
"github.com/uselagoon/build-deploy-tool/internal/helpers"
910
"github.com/uselagoon/build-deploy-tool/internal/lagoon"
1011
"github.com/uselagoon/build-deploy-tool/internal/testdata"
@@ -69,7 +70,7 @@ func TestIdentifyNativeCronjobs(t *testing.T) {
6970
helpers.UnsetEnvVars(nil) //unset variables before running tests
7071
// set the environment variables from args
7172
savedTemplates := tt.templatePath
72-
generator, err := testdata.SetupEnvironment(*rootCmd, savedTemplates, tt.args)
73+
generator, err := testdata.SetupEnvironment(generator.GeneratorInput{}, savedTemplates, tt.args)
7374
if err != nil {
7475
t.Errorf("%v", err)
7576
}

0 commit comments

Comments
 (0)