fix(terraform): preserve explicit init context

Author: zack-is-cool

internal/exec/terraform_execute_helpers_exec.go

@@ -448,7 +448,7 @@ func executeMainTerraformCommand( //nolint:revive // argument-limit: opts variad
 	// implicit init so post-init provisioners can complete and persist provider
 	// locks for workdir and vendored components.
 	if err == nil && info.SubCommand == subcommandInit {
-		dispatchAfterInitFn(atmosConfig, info, componentPath)
+		dispatchAfterInitFn(atmosConfig, info, componentPath, opts...)
 	}
 
 	exitCode := resolveExitCode(err)

internal/exec/terraform_execute_helpers_workspace_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	errUtils "github.com/cloudposse/atmos/errors"
+	provWorkdir "github.com/cloudposse/atmos/pkg/provisioner/workdir"
 	"github.com/cloudposse/atmos/pkg/schema"
 )
 
@@ -223,16 +224,20 @@ func TestExecuteMainTerraformCommand_ExplicitInitDispatchesAfterInit(t *testing.
 	t.Cleanup(func() { dispatchAfterInitFn = originalDispatch })
 
 	var dispatched bool
-	dispatchAfterInitFn = func(atmosConfig *schema.AtmosConfiguration, info *schema.ConfigAndStacksInfo, componentPath string, _ ...ShellCommandOption) {
+	var dispatchOpts []ShellCommandOption
+	dispatchAfterInitFn = func(atmosConfig *schema.AtmosConfiguration, info *schema.ConfigAndStacksInfo, componentPath string, opts ...ShellCommandOption) {
 		dispatched = true
+		dispatchOpts = append([]ShellCommandOption(nil), opts...)
 		assert.Equal(t, "/tmp/component", componentPath)
 		assert.Equal(t, subcommandInit, info.SubCommand)
 	}
 
 	atmosConfig := schema.AtmosConfiguration{}
 	info := schema.ConfigAndStacksInfo{SubCommand: subcommandInit, DryRun: true}
-	require.NoError(t, executeMainTerraformCommand(&atmosConfig, &info, []string{subcommandInit}, "/tmp/component", false))
+	ctx := provWorkdir.WithOutputSuppressed(t.Context())
+	require.NoError(t, executeMainTerraformCommand(&atmosConfig, &info, []string{subcommandInit}, "/tmp/component", false, WithProcessContext(ctx)))
 	assert.True(t, dispatched, "successful explicit init must dispatch after.terraform.init provisioners")
+	assert.True(t, provWorkdir.OutputSuppressed(shellCommandContext(dispatchOpts...)))
 }
 
 func TestExecuteMainTerraformCommand_FailedExplicitInitSkipsAfterInit(t *testing.T) {

pkg/hooks/step_engine_test.go

@@ -375,12 +375,49 @@ func TestStepEngineSuppressesTransientOutputWhenWritersAreSet(t *testing.T) {
 		suppressed:  &suppressed,
 	})
 
-	ctx := stepExecContext(&Hook{Kind: stepKindName, Type: "output-suppression-capture-test"})
-	ctx.Stdout = io.Discard
+	tests := []struct {
+		name       string
+		context    *ExecContext
+		run        func(*ExecContext) (*Output, error)
+		setWriter  func(*ExecContext)
+		suppressed bool
+	}{
+		{
+			name:       "step stdout",
+			context:    stepExecContext(&Hook{Kind: stepKindName, Type: "output-suppression-capture-test"}),
+			run:        stepEngine{}.Run,
+			setWriter:  func(ctx *ExecContext) { ctx.Stdout = io.Discard },
+			suppressed: true,
+		},
+		{
+			name: "steps stderr",
+			context: stepsExecContext(&Hook{Kind: stepsKindName, With: []any{
+				map[string]any{"type": "output-suppression-capture-test"},
+			}}),
+			run:        stepsEngine{}.Run,
+			setWriter:  func(ctx *ExecContext) { ctx.Stderr = io.Discard },
+			suppressed: true,
+		},
+		{
+			name:       "step without writers",
+			context:    stepExecContext(&Hook{Kind: stepKindName, Type: "output-suppression-capture-test"}),
+			run:        stepEngine{}.Run,
+			suppressed: false,
+		},
+	}
 
-	_, err := stepEngine{}.Run(ctx)
-	require.NoError(t, err)
-	assert.True(t, suppressed)
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			suppressed = false
+			if tt.setWriter != nil {
+				tt.setWriter(tt.context)
+			}
+
+			_, err := tt.run(tt.context)
+			require.NoError(t, err)
+			assert.Equal(t, tt.suppressed, suppressed)
+		})
+	}
 }
 
 func TestStepHooksDefaultToComponentWorkingDirectory(t *testing.T) {