Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions pkg/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ type ComponentConstructors struct {
NewGitGenerator func(di.Injector) generators.Generator
NewBlueprintHandler func(di.Injector) blueprint.BlueprintHandler
NewTerraformGenerator func(di.Injector) generators.Generator
NewKustomizeGenerator func(di.Injector) generators.Generator
NewToolsManager func(di.Injector) tools.ToolsManager
NewKubernetesManager func(di.Injector) kubernetes.KubernetesManager
NewKubernetesClient func(di.Injector) kubernetes.KubernetesClient
Expand Down Expand Up @@ -196,9 +195,7 @@ func NewDefaultConstructors() ComponentConstructors {
NewTerraformGenerator: func(injector di.Injector) generators.Generator {
return generators.NewTerraformGenerator(injector)
},
NewKustomizeGenerator: func(injector di.Injector) generators.Generator {
return generators.NewKustomizeGenerator(injector)
},

NewToolsManager: func(injector di.Injector) tools.ToolsManager {
return tools.NewToolsManager(injector)
},
Expand Down Expand Up @@ -956,10 +953,6 @@ func (c *BaseController) createGeneratorsComponents(req Requirements) error {
c.injector.Register("terraformGenerator", terraformGenerator)
}

if !existingGeneratorNames["kustomizeGenerator"] {
kustomizeGenerator := c.constructors.NewKustomizeGenerator(c.injector)
c.injector.Register("kustomizeGenerator", kustomizeGenerator)
}
}

return nil
Expand Down
25 changes: 6 additions & 19 deletions pkg/controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,7 @@ func TestNewController(t *testing.T) {
}
return nil
},
"NewKustomizeGenerator": func() error {
generator := controller.constructors.NewKustomizeGenerator(mocks.Injector)
if generator == nil {
return fmt.Errorf("NewKustomizeGenerator returned nil")
}
return nil
},

"NewToolsManager": func() error {
manager := controller.constructors.NewToolsManager(mocks.Injector)
if manager == nil {
Expand Down Expand Up @@ -2572,38 +2566,31 @@ func TestBaseController_createGeneratorsComponents(t *testing.T) {
}
})

t.Run("CreatesTerraformAndKustomizeGeneratorsWhenBlueprintRequired", func(t *testing.T) {
// Given a controller with mocked terraform and kustomize generators
t.Run("CreatesTerraformGeneratorWhenBlueprintRequired", func(t *testing.T) {
// Given a controller with mocked terraform generator
controller, mocks := setup(t)

// Mock generators
// Mock generator
mockTerraformGenerator := generators.NewMockGenerator()
mockKustomizeGenerator := generators.NewMockGenerator()
controller.constructors.NewTerraformGenerator = func(di.Injector) generators.Generator {
return mockTerraformGenerator
}
controller.constructors.NewKustomizeGenerator = func(di.Injector) generators.Generator {
return mockKustomizeGenerator
}

// When creating generator components with generators and blueprint enabled
err := controller.createGeneratorsComponents(Requirements{
Generators: true,
Blueprint: true,
})

// Then no error should be returned and both generators should be registered
// Then no error should be returned and terraform generator should be registered
if err != nil {
t.Errorf("Expected no error, got %v", err)
}

// Verify generators were created
// Verify generator was created
if resolved := mocks.Injector.Resolve("terraformGenerator"); resolved != mockTerraformGenerator {
t.Error("Expected terraform generator to be registered")
}
if resolved := mocks.Injector.Resolve("kustomizeGenerator"); resolved != mockKustomizeGenerator {
t.Error("Expected kustomize generator to be registered")
}
})

t.Run("DoesNotCreateDuplicateGenerators", func(t *testing.T) {
Expand Down
4 changes: 1 addition & 3 deletions pkg/controller/mock_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@ func NewMockConstructors() ComponentConstructors {
NewTerraformGenerator: func(injector di.Injector) generators.Generator {
return generators.NewMockGenerator()
},
NewKustomizeGenerator: func(injector di.Injector) generators.Generator {
return generators.NewMockGenerator()
},

NewToolsManager: func(injector di.Injector) tools.ToolsManager {
return tools.NewMockToolsManager()
},
Expand Down
4 changes: 0 additions & 4 deletions pkg/controller/mock_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -441,10 +441,6 @@ func TestNewMockConstructors(t *testing.T) {
if terraformGenerator == nil {
t.Error("expected NewTerraformGenerator to return non-nil")
}
kustomizeGenerator := constructors.NewKustomizeGenerator(injector)
if kustomizeGenerator == nil {
t.Error("expected NewKustomizeGenerator to return non-nil")
}

// Test env printer constructors
awsEnvPrinter := constructors.NewAwsEnvPrinter(injector)
Expand Down
81 changes: 0 additions & 81 deletions pkg/generators/kustomize_generator.go

This file was deleted.

Loading
Loading