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
41 changes: 26 additions & 15 deletions pkg/provisioner/provisioner.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,11 @@ func (i *Provisioner) Up(blueprint *blueprintv1alpha1.Blueprint) error {
return fmt.Errorf("blueprint not provided")
}

if err := i.ensureTerraformStack(); err != nil {
return err
}
if i.TerraformStack == nil {
if i.Runtime != nil && i.Runtime.ConfigHandler != nil {
terraformEnabled := i.Runtime.ConfigHandler.GetBool("terraform.enabled", false)
if terraformEnabled {
i.TerraformStack = terraforminfra.NewStack(i.Runtime)
} else {
return nil
}
} else {
return nil
}
return nil
}
if err := i.TerraformStack.Up(blueprint); err != nil {
return fmt.Errorf("failed to run terraform up: %w", err)
Expand All @@ -121,6 +115,9 @@ func (i *Provisioner) Down(blueprint *blueprintv1alpha1.Blueprint) error {
return fmt.Errorf("blueprint not provided")
}

if err := i.ensureTerraformStack(); err != nil {
return err
}
if i.TerraformStack == nil {
return nil
}
Expand Down Expand Up @@ -223,11 +220,9 @@ func (i *Provisioner) CheckNodeHealth(ctx context.Context, options NodeHealthChe

if hasNodeCheck {
if i.ClusterClient == nil {
if i.Runtime != nil && i.Runtime.ConfigHandler != nil {
clusterDriver := i.Runtime.ConfigHandler.GetString("cluster.driver", "")
if clusterDriver == "talos" || clusterDriver == "omni" {
i.ClusterClient = cluster.NewTalosClusterClient()
}
clusterDriver := i.Runtime.ConfigHandler.GetString("cluster.driver", "")
if clusterDriver == "talos" || clusterDriver == "omni" {
i.ClusterClient = cluster.NewTalosClusterClient()
}
}

Expand Down Expand Up @@ -352,3 +347,19 @@ func (i *Provisioner) Close() {
i.ClusterClient.Close()
}
}

// =============================================================================
// Private Methods
// =============================================================================

// ensureTerraformStack initializes the TerraformStack if terraform is enabled and the stack is not already initialized.
// Returns an error if initialization fails, or nil if terraform is disabled or already initialized.
func (i *Provisioner) ensureTerraformStack() error {
if i.TerraformStack != nil {
return nil
}
if i.Runtime.ConfigHandler.GetBool("terraform.enabled", false) {
i.TerraformStack = terraforminfra.NewStack(i.Runtime)
}
return nil
}
79 changes: 78 additions & 1 deletion pkg/provisioner/provisioner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,40 @@ func TestProvisioner_Up(t *testing.T) {
if err != nil {
t.Errorf("Expected no error when terraform is disabled, got: %v", err)
}

if provisioner.TerraformStack != nil {
t.Error("Expected TerraformStack to remain nil when terraform is disabled")
}
})

t.Run("SuccessInitializesTerraformStackLazily", func(t *testing.T) {
mocks := setupProvisionerMocks(t)
mockConfigHandler := mocks.ConfigHandler.(*config.MockConfigHandler)
mockConfigHandler.GetBoolFunc = func(key string, defaultValue ...bool) bool {
if key == "terraform.enabled" {
return true
}
if len(defaultValue) > 0 {
return defaultValue[0]
}
return false
}
provisioner := NewProvisioner(mocks.Runtime, mocks.BlueprintHandler)

if provisioner.TerraformStack != nil {
t.Error("Expected TerraformStack to be nil before Up() is called")
}

blueprint := createTestBlueprint()
err := provisioner.Up(blueprint)

if provisioner.TerraformStack == nil {
t.Error("Expected TerraformStack to be initialized after Up() when terraform is enabled, even if operation fails")
}

if err == nil {
t.Log("Up() succeeded (unexpected but not a test failure)")
}
})

t.Run("ErrorTerraformStackUp", func(t *testing.T) {
Expand Down Expand Up @@ -393,15 +427,58 @@ func TestProvisioner_Down(t *testing.T) {

t.Run("SuccessSkipsTerraformWhenDisabled", func(t *testing.T) {
mocks := setupProvisionerMocks(t)
mockConfigHandler := mocks.ConfigHandler.(*config.MockConfigHandler)
mockConfigHandler.GetBoolFunc = func(key string, defaultValue ...bool) bool {
if key == "terraform.enabled" {
return false
}
if len(defaultValue) > 0 {
return defaultValue[0]
}
return false
}
provisioner := NewProvisioner(mocks.Runtime, mocks.BlueprintHandler)
provisioner.TerraformStack = nil

blueprint := createTestBlueprint()
err := provisioner.Down(blueprint)

if err != nil {
t.Errorf("Expected no error when terraform is disabled, got: %v", err)
}

if provisioner.TerraformStack != nil {
t.Error("Expected TerraformStack to remain nil when terraform is disabled")
}
})

t.Run("SuccessInitializesTerraformStackLazily", func(t *testing.T) {
mocks := setupProvisionerMocks(t)
mockConfigHandler := mocks.ConfigHandler.(*config.MockConfigHandler)
mockConfigHandler.GetBoolFunc = func(key string, defaultValue ...bool) bool {
if key == "terraform.enabled" {
return true
}
if len(defaultValue) > 0 {
return defaultValue[0]
}
return false
}
provisioner := NewProvisioner(mocks.Runtime, mocks.BlueprintHandler)

if provisioner.TerraformStack != nil {
t.Error("Expected TerraformStack to be nil before Down() is called")
}

blueprint := createTestBlueprint()
err := provisioner.Down(blueprint)

if err != nil {
t.Errorf("Expected no error, got: %v", err)
}

if provisioner.TerraformStack == nil {
t.Error("Expected TerraformStack to be initialized after Down() when terraform is enabled")
}
})

t.Run("ErrorTerraformStackDown", func(t *testing.T) {
Expand Down
Loading