Merge remote-tracking branch 'origin/main' into osterman/auth-env-vars-research

Author: osterman

cmd/terraform/utils.go

@@ -224,6 +224,10 @@ func terraformRunWithOptions(parentCmd, actualCmd *cobra.Command, args []string,
 		return err
 	}
 
+	// Apply parsed options to info BEFORE prompting, so hasMultiComponentFlags() works correctly.
+	// This fixes issue #1945: --all flag must be set before resolveAndPromptForArgs checks it.
+	applyOptionsToInfo(&info, opts)
+
 	// Resolve paths and prompt for missing component/stack interactively.
 	if err := resolveAndPromptForArgs(&info, actualCmd); err != nil {
 		return err
@@ -235,8 +239,6 @@ func terraformRunWithOptions(parentCmd, actualCmd *cobra.Command, args []string,
 		return nil
 	}
 
-	applyOptionsToInfo(&info, opts)
-
 	// Handle --identity flag for interactive selection when used without a value.
 	if info.Identity == cfg.IdentityFlagSelectValue {
 		handleInteractiveIdentitySelection(&info)

cmd/terraform/utils_test.go

@@ -316,6 +316,144 @@ func TestCheckTerraformFlags_AllEdgeCases(t *testing.T) {
 	}
 }
 
+// TestHasMultiComponentFlags tests the hasMultiComponentFlags function.
+func TestHasMultiComponentFlags(t *testing.T) {
+	tests := []struct {
+		name     string
+		info     *schema.ConfigAndStacksInfo
+		expected bool
+	}{
+		{
+			name:     "no flags set",
+			info:     &schema.ConfigAndStacksInfo{},
+			expected: false,
+		},
+		{
+			name: "all flag set",
+			info: &schema.ConfigAndStacksInfo{
+				All: true,
+			},
+			expected: true,
+		},
+		{
+			name: "affected flag set",
+			info: &schema.ConfigAndStacksInfo{
+				Affected: true,
+			},
+			expected: true,
+		},
+		{
+			name: "query flag set",
+			info: &schema.ConfigAndStacksInfo{
+				Query: ".components.test",
+			},
+			expected: true,
+		},
+		{
+			name: "components flag set",
+			info: &schema.ConfigAndStacksInfo{
+				Components: []string{"comp1", "comp2"},
+			},
+			expected: true,
+		},
+		{
+			name: "empty components slice",
+			info: &schema.ConfigAndStacksInfo{
+				Components: []string{},
+			},
+			expected: false,
+		},
+		{
+			name: "multiple multi-component flags set",
+			info: &schema.ConfigAndStacksInfo{
+				All:   true,
+				Query: ".components.test",
+			},
+			expected: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := hasMultiComponentFlags(tt.info)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}
+
+// TestHandleInteractiveComponentStackSelection_SkipsPromptForMultiComponentFlags tests that
+// interactive prompting is skipped when multi-component flags are set.
+// Regression test for: https://github.com/cloudposse/atmos/issues/1945
+// Before the fix, `--all` flag was not applied to info before this check, causing
+// the prompt to appear even when `--all` was specified.
+func TestHandleInteractiveComponentStackSelection_SkipsPromptForMultiComponentFlags(t *testing.T) {
+	tests := []struct {
+		name string
+		info *schema.ConfigAndStacksInfo
+	}{
+		{
+			name: "skips prompt when --all flag is set",
+			info: &schema.ConfigAndStacksInfo{
+				All: true,
+			},
+		},
+		{
+			name: "skips prompt when --affected flag is set",
+			info: &schema.ConfigAndStacksInfo{
+				Affected: true,
+			},
+		},
+		{
+			name: "skips prompt when --query flag is set",
+			info: &schema.ConfigAndStacksInfo{
+				Query: ".components.test",
+			},
+		},
+		{
+			name: "skips prompt when --components flag is set",
+			info: &schema.ConfigAndStacksInfo{
+				Components: []string{"comp1", "comp2"},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cmd := &cobra.Command{Use: "plan"}
+
+			// Capture the initial state - ComponentFromArg should remain empty
+			// because the function should skip prompting and return early.
+			initialComponent := tt.info.ComponentFromArg
+			initialStack := tt.info.Stack
+
+			err := handleInteractiveComponentStackSelection(tt.info, cmd)
+
+			// Should return nil (no error) and NOT modify the info struct.
+			assert.NoError(t, err)
+			assert.Equal(t, initialComponent, tt.info.ComponentFromArg,
+				"ComponentFromArg should not be modified when multi-component flags are set")
+			assert.Equal(t, initialStack, tt.info.Stack,
+				"Stack should not be modified when multi-component flags are set")
+		})
+	}
+}
+
+// TestHandleInteractiveComponentStackSelection_SkipsWhenBothProvided tests that
+// interactive prompting is skipped when both component and stack are already provided.
+func TestHandleInteractiveComponentStackSelection_SkipsWhenBothProvided(t *testing.T) {
+	cmd := &cobra.Command{Use: "plan"}
+	info := &schema.ConfigAndStacksInfo{
+		ComponentFromArg: "my-component",
+		Stack:            "my-stack",
+	}
+
+	err := handleInteractiveComponentStackSelection(info, cmd)
+
+	assert.NoError(t, err)
+	assert.Equal(t, "my-component", info.ComponentFromArg)
+	assert.Equal(t, "my-stack", info.Stack)
+}
+
 // TestStackFlagCompletion_NoArgs tests the stackFlagCompletion function without args.
 func TestStackFlagCompletion_NoArgs(t *testing.T) {
 	t.Chdir("../../examples/demo-stacks")
@@ -394,53 +532,6 @@ func TestIsMultiComponentExecution(t *testing.T) {
 	}
 }
 
-// TestHasMultiComponentFlags tests the hasMultiComponentFlags function.
-func TestHasMultiComponentFlags(t *testing.T) {
-	tests := []struct {
-		name     string
-		info     *schema.ConfigAndStacksInfo
-		expected bool
-	}{
-		{
-			name:     "all flag",
-			info:     &schema.ConfigAndStacksInfo{All: true},
-			expected: true,
-		},
-		{
-			name:     "affected flag",
-			info:     &schema.ConfigAndStacksInfo{Affected: true},
-			expected: true,
-		},
-		{
-			name:     "components set",
-			info:     &schema.ConfigAndStacksInfo{Components: []string{"comp1"}},
-			expected: true,
-		},
-		{
-			name:     "query set",
-			info:     &schema.ConfigAndStacksInfo{Query: ".test"},
-			expected: true,
-		},
-		{
-			name:     "no flags",
-			info:     &schema.ConfigAndStacksInfo{},
-			expected: false,
-		},
-		{
-			name:     "empty components slice",
-			info:     &schema.ConfigAndStacksInfo{Components: []string{}},
-			expected: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := hasMultiComponentFlags(tt.info)
-			assert.Equal(t, tt.expected, result)
-		})
-	}
-}
-
 // TestHasNonAffectedMultiFlags tests the hasNonAffectedMultiFlags function.
 func TestHasNonAffectedMultiFlags(t *testing.T) {
 	tests := []struct {

internal/exec/terraform_affected.go

@@ -5,6 +5,7 @@ import (
 	log "github.com/cloudposse/atmos/pkg/logger"
 	"github.com/cloudposse/atmos/pkg/perf"
 	"github.com/cloudposse/atmos/pkg/schema"
+	"github.com/cloudposse/atmos/pkg/ui"
 	u "github.com/cloudposse/atmos/pkg/utils"
 )
 
@@ -104,6 +105,7 @@ func executeAffectedComponents(affectedList []schema.Affected, info *schema.Conf
 
 	// Early return for empty list - nothing to process.
 	if len(affectedList) == 0 {
+		ui.Success("No components affected")
 		return nil
 	}
 

internal/exec/terraform_query.go

@@ -5,6 +5,7 @@ import (
 	log "github.com/cloudposse/atmos/pkg/logger"
 	"github.com/cloudposse/atmos/pkg/perf"
 	"github.com/cloudposse/atmos/pkg/schema"
+	"github.com/cloudposse/atmos/pkg/ui"
 )
 
 // ExecuteTerraformQuery executes `atmos terraform <command> --query <yq-expression --stack <stack>`.
@@ -16,12 +17,8 @@ func ExecuteTerraformQuery(info *schema.ConfigAndStacksInfo) error {
 		return err
 	}
 
-	var logFunc func(msg any, keyvals ...any)
-	if info.DryRun {
-		logFunc = log.Info
-	} else {
-		logFunc = log.Debug
-	}
+	// Always use debug level for internal logging.
+	logFunc := log.Debug
 
 	stacks, err := ExecuteDescribeStacks(
 		&atmosConfig,
@@ -40,12 +37,24 @@ func ExecuteTerraformQuery(info *schema.ConfigAndStacksInfo) error {
 		return err
 	}
 
+	// Track how many components were processed.
+	processedCount := 0
+
 	err = walkTerraformComponents(stacks, func(stackName, componentName string, componentSection map[string]any) error {
-		return processTerraformComponent(&atmosConfig, info, stackName, componentName, componentSection, logFunc)
+		processed, err := processTerraformComponent(&atmosConfig, info, stackName, componentName, componentSection, logFunc)
+		if processed {
+			processedCount++
+		}
+		return err
 	})
 	if err != nil {
 		return err
 	}
 
+	// Show success message if no components matched the criteria.
+	if processedCount == 0 {
+		ui.Success("No components matched")
+	}
+
 	return nil
 }