test: cover remaining log grouping patch paths

Author: osterman

cmd/cmd_utils_test.go

@@ -18,6 +18,8 @@ import (
 
 	errUtils "github.com/cloudposse/atmos/errors"
 	e "github.com/cloudposse/atmos/internal/exec"
+	"github.com/cloudposse/atmos/pkg/ci"
+	githubprovider "github.com/cloudposse/atmos/pkg/ci/providers/github"
 	envpkg "github.com/cloudposse/atmos/pkg/env"
 	"github.com/cloudposse/atmos/pkg/perf"
 	"github.com/cloudposse/atmos/pkg/reexec"
@@ -2136,6 +2138,44 @@ func TestProcessCustomCommands(t *testing.T) {
 	}
 }
 
+func TestExecuteCustomCommandShellStepPropagatesCILogGroupSentinel(t *testing.T) {
+	_ = NewTestKit(t)
+
+	restore := ci.SwapRegistryForTest()
+	t.Cleanup(restore)
+	ci.Register(githubprovider.NewProvider())
+	t.Setenv("GITHUB_ACTIONS", "true")
+
+	workDir := t.TempDir()
+	sentinelFile := filepath.Join(workDir, "sentinel.txt")
+	atmosConfig := schema.AtmosConfiguration{
+		BasePath: workDir,
+		CI:       schema.CIConfig{Enabled: true},
+	}
+	parentCmd := &cobra.Command{Use: "atmos"}
+	commands := []schema.Command{{
+		Name:             "cover-ci-shell",
+		Description:      "exercise shell dispatch with CI grouping",
+		WorkingDirectory: workDir,
+		Steps: []schema.Task{{
+			Name:    "capture-sentinel",
+			Type:    schema.TaskTypeShell,
+			Command: `printf %s "$ATMOS_CI_LOG_GROUP_ACTIVE" > sentinel.txt`,
+		}},
+	}}
+
+	require.NoError(t, processCustomCommands(atmosConfig, commands, parentCmd))
+	customCmd := findSubcommand(parentCmd, "cover-ci-shell")
+	require.NotNil(t, customCmd)
+
+	customCmd.PreRun(customCmd, nil)
+	customCmd.Run(customCmd, nil)
+
+	got, err := os.ReadFile(sentinelFile)
+	require.NoError(t, err)
+	assert.Equal(t, "1", string(got))
+}
+
 func TestFindTypedValue(t *testing.T) {
 	tests := []struct {
 		name          string

internal/exec/workflow_utils_test.go

@@ -1456,6 +1456,77 @@ func TestExecuteWorkflow_DryRunBackgroundAndControlSteps(t *testing.T) {
 	require.NoError(t, err)
 }
 
+func TestExecuteWorkflow_DryRunShellStepContainerOverride(t *testing.T) {
+	stacksPath := "../../tests/fixtures/scenarios/workflows"
+	t.Setenv("ATMOS_CLI_CONFIG_PATH", stacksPath)
+	t.Setenv("ATMOS_BASE_PATH", stacksPath)
+
+	atmosConfig, err := cfg.InitCliConfig(schema.ConfigAndStacksInfo{}, false)
+	require.NoError(t, err)
+
+	workflowDef := &schema.WorkflowDefinition{
+		Description: "Test shell step container override in dry run",
+		Steps: []schema.WorkflowStep{{
+			Name:    "step-container",
+			Type:    schema.TaskTypeShell,
+			Command: "echo in step container",
+			Container: &schema.WorkflowContainer{
+				Image: "alpine:latest",
+			},
+		}},
+	}
+
+	err = ExecuteWorkflow(atmosConfig, "test-step-container", "/path/to/workflow.yaml", workflowDef, true, "", "", "")
+	require.NoError(t, err)
+}
+
+func TestExecuteWorkflow_DryRunShellWorkflowContainer(t *testing.T) {
+	stacksPath := "../../tests/fixtures/scenarios/workflows"
+	t.Setenv("ATMOS_CLI_CONFIG_PATH", stacksPath)
+	t.Setenv("ATMOS_BASE_PATH", stacksPath)
+
+	atmosConfig, err := cfg.InitCliConfig(schema.ConfigAndStacksInfo{}, false)
+	require.NoError(t, err)
+
+	workflowDef := &schema.WorkflowDefinition{
+		Description: "Test workflow container shell step in dry run",
+		Container: &schema.WorkflowContainer{
+			Image: "alpine:latest",
+		},
+		Output: "none",
+		Steps: []schema.WorkflowStep{{
+			Name:    "workflow-container",
+			Type:    schema.TaskTypeShell,
+			Command: "echo in workflow container",
+		}},
+	}
+
+	err = ExecuteWorkflow(atmosConfig, "test-workflow-container", "/path/to/workflow.yaml", workflowDef, true, "", "", "")
+	require.NoError(t, err)
+}
+
+func TestExecuteWorkflow_DryRunAtmosStepStackBeforeSeparator(t *testing.T) {
+	stacksPath := "../../tests/fixtures/scenarios/workflows"
+	t.Setenv("ATMOS_CLI_CONFIG_PATH", stacksPath)
+	t.Setenv("ATMOS_BASE_PATH", stacksPath)
+
+	atmosConfig, err := cfg.InitCliConfig(schema.ConfigAndStacksInfo{}, false)
+	require.NoError(t, err)
+
+	workflowDef := &schema.WorkflowDefinition{
+		Description: "Test atmos step stack insertion before separator",
+		Steps: []schema.WorkflowStep{{
+			Name:    "plan",
+			Type:    schema.TaskTypeAtmos,
+			Command: "terraform plan vpc -- -target=module.example",
+			Stack:   "tenant1-ue2-dev",
+		}},
+	}
+
+	err = ExecuteWorkflow(atmosConfig, "test-atmos-stack-before-separator", "/path/to/workflow.yaml", workflowDef, true, "", "", "")
+	require.NoError(t, err)
+}
+
 func registerGitHubLogGroupingForWorkflowTest(t *testing.T) {
 	t.Helper()