Made EnableTerraformCLILogging Optional and added a description. Adde…

…d Operation key value pair to logs.
upbound · May 10, 2024 · 503d09a · 503d09a
1 parent 36ee6e7
commit 503d09a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/apis/v1beta1/workspace_types.go b/apis/v1beta1/workspace_types.go
@@ -148,6 +148,8 @@ type WorkspaceParameters struct {
 	// Arguments to be included in the terraform destroy CLI command
 	DestroyArgs []string `json:"destroyArgs,omitempty"`
 
+	// Boolean value to indicate  CLI logging of terraform execution is enabled or not
+    // +optional
 	EnableTerraformCLILogging bool  `json:"enableTerraformCLILogging,omitempty"`
 }
 

diff --git a/internal/terraform/terraform.go b/internal/terraform/terraform.go
@@ -576,7 +576,7 @@ func (h Harness) Diff(ctx context.Context, o ...Option) (bool, error) {
 		}
 	case 2:
 		if h.EnableTerraformCLILogging {
-			h.Logger.Info("plan-"+string(log))
+			h.Logger.Info(string(log),"operation","plan")
 		}
 		return true, nil
 	}
@@ -616,7 +616,7 @@ func (h Harness) Apply(ctx context.Context, o ...Option) error {
 	switch cmd.ProcessState.ExitCode() {
 	case 0:
 		if h.EnableTerraformCLILogging {
-			h.Logger.Info("apply-"+string(log))
+			h.Logger.Info(string(log),"operation","apply")
 		}
 	default:
 		ee := &exec.ExitError{}
@@ -661,7 +661,7 @@ func (h Harness) Destroy(ctx context.Context, o ...Option) error {
 	switch cmd.ProcessState.ExitCode() {
 	case 0:
 		if h.EnableTerraformCLILogging {
-			h.Logger.Info("delete-"+string(log))
+			h.Logger.Info(string(log),"operation","delete")
 		}
 	default:
 		ee := &exec.ExitError{}

diff --git a/package/crds/tf.upbound.io_workspaces.yaml b/package/crds/tf.upbound.io_workspaces.yaml
@@ -78,6 +78,8 @@ spec:
                       type: string
                     type: array
                   enableTerraformCLILogging:
+                    description: Boolean value to indicate  CLI logging of terraform
+                      execution is enabled or not
                     type: boolean
                   entrypoint:
                     default: ""