Fix terraform parallelism implementation (#455)

Use plan and apply args modifiers directly instead of env vars that break init

Author: michaeljguarino

pkg/harness/controller/controller.go

@@ -216,6 +216,7 @@ func (in *stackRunController) prepare() error {
 		ExecDir:   in.execWorkDir(),
 		Variables: variables,
 		Scanner:   security.NewScanner(in.stackRun.PolicyEngine),
+		Run:       in.stackRun,
 	})
 
 	return nil

pkg/harness/stackrun/v1/types.go

@@ -87,16 +87,7 @@ func (in *StackRun) Env() []string {
 		env = append(env, fmt.Sprintf("PLURAL_CONSOLE_URL=%s", lo.FromPtr(in.Creds.URL)))
 	}
 
-	tfArgs := "TF_CLI_ARGS="
-	if in.Parallelism != nil {
-		tfArgs += fmt.Sprintf("-parallelism=%d ", *in.Parallelism)
-	}
-
-	if in.Refresh != nil {
-		tfArgs += fmt.Sprintf("-refresh=%t", *in.Refresh)
-	}
-
-	return append(env, tfArgs)
+	return env
 }
 
 // Vars parses the StackRun.Variables map as a valid JSON.

pkg/harness/tool/terraform/modifier.go

@@ -16,11 +16,19 @@ func (in *PlanArgsModifier) Args(args []string) []string {
 		return args
 	}
 
+	if in.parallelism != nil {
+		args = append(args, fmt.Sprintf("-parallelism=%d", *in.parallelism))
+	}
+
+	if in.refresh != nil {
+		args = append(args, fmt.Sprintf("-refresh=%t", *in.refresh))
+	}
+
 	return append(args, fmt.Sprintf("-out=%s", in.planFileName))
 }
 
-func NewPlanArgsModifier(planFileName string) v1.Modifier {
-	return &PlanArgsModifier{planFileName: planFileName}
+func (tf *Terraform) NewPlanArgsModifier(planFileName string) v1.Modifier {
+	return &PlanArgsModifier{planFileName: planFileName, parallelism: tf.parallelism, refresh: tf.refresh}
 }
 
 // Args implements [v1.ArgsModifier] type.
@@ -33,9 +41,13 @@ func (in *ApplyArgsModifier) Args(args []string) []string {
 		return args
 	}
 
+	if in.parallelism != nil {
+		args = append(args, fmt.Sprintf("-parallelism=%d", *in.parallelism))
+	}
+
 	return append(args, in.planFileName)
 }
 
-func NewApplyArgsModifier(dir, planFileName string) v1.Modifier {
-	return &ApplyArgsModifier{planFileName: planFileName, dir: dir}
+func (tf *Terraform) NewApplyArgsModifier(dir, planFileName string) v1.Modifier {
+	return &ApplyArgsModifier{planFileName: planFileName, dir: dir, parallelism: tf.parallelism, refresh: tf.refresh}
 }

pkg/harness/tool/terraform/modifier_types.go

@@ -10,6 +10,12 @@ type PlanArgsModifier struct {
 
 	// planFileName
 	planFileName string
+
+	// parallelism
+	parallelism *int64
+
+	// refresh
+	refresh *bool
 }
 
 // ApplyArgsModifier implements [v1.ArgsModifier] interface.
@@ -21,4 +27,10 @@ type ApplyArgsModifier struct {
 
 	// dir
 	dir string
+
+	// parallelism
+	parallelism *int64
+
+	// refresh
+	refresh *bool
 }

pkg/harness/tool/terraform/terraform.go

@@ -80,9 +80,9 @@ func (in *Terraform) Output() ([]*console.StackOutputAttributes, error) {
 func (in *Terraform) Modifier(stage console.StepStage) v1.Modifier {
 	switch stage {
 	case console.StepStagePlan:
-		return NewPlanArgsModifier(in.planFileName)
+		return in.NewPlanArgsModifier(in.planFileName)
 	case console.StepStageApply:
-		return NewApplyArgsModifier(in.dir, in.planFileName)
+		return in.NewApplyArgsModifier(in.dir, in.planFileName)
 	}
 
 	return v1.NewDefaultModifier()
@@ -182,5 +182,7 @@ func New(config v1.Config) v1.Tool {
 		DefaultTool: v1.DefaultTool{Scanner: config.Scanner},
 		dir:         config.ExecDir,
 		variables:   config.Variables,
+		parallelism: config.Run.Parallelism,
+		refresh:     config.Run.Refresh,
 	}).init()
 }

pkg/harness/tool/terraform/terraform_types.go

@@ -22,4 +22,12 @@ type Terraform struct {
 	// variables is a JSON encoded string representing
 	// terraform variable file.
 	variables *string
+
+	// parallelism is the number of parallel terraform operations.
+	// Default: 10
+	parallelism *int64
+
+	// refresh is a flag to refresh the state.
+	// Default: true
+	refresh *bool
 }

pkg/harness/tool/v1/types.go

@@ -6,6 +6,8 @@ import (
 	console "github.com/pluralsh/console/go/client"
 
 	securityv1 "github.com/pluralsh/deployment-operator/pkg/harness/security/v1"
+
+	stackrunv1 "github.com/pluralsh/deployment-operator/pkg/harness/stackrun/v1"
 )
 
 // Tool handles one of the supported infrastructure management tools.
@@ -93,4 +95,6 @@ type Config struct {
 
 	// Scanner TODO
 	Scanner securityv1.Scanner
+
+	Run *stackrunv1.StackRun
 }