Merge branch 'main' into list/DEV-3143-custom-columns

Author: Cerebrovinny

.gitignore

@@ -39,9 +39,10 @@
 **/cache.*.txt
 
 # Ignore components vendored during tests
-tests/fixtures/scenarios/vendor/components/**
 examples/demo-vendoring/components/**
+tests/fixtures/scenarios/vendor-globs/components/**
+tests/fixtures/scenarios/vendor/components/**
 
 # Coverage files
 coverage.out
-coverage.html
+coverage.html

cmd/cmd_utils.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"time"
 
+	log "github.com/charmbracelet/log"
 	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 
@@ -19,8 +20,12 @@ import (
 	"github.com/cloudposse/atmos/pkg/ui/theme"
 	u "github.com/cloudposse/atmos/pkg/utils"
 	"github.com/cloudposse/atmos/pkg/version"
+	"github.com/go-git/go-git/v5"
 )
 
+// Define a constant for the dot string that appears multiple times.
+const currentDirPath = "."
+
 // ValidateConfig holds configuration options for Atmos validation.
 // CheckStack determines whether stack configuration validation should be performed.
 type ValidateConfig struct {
@@ -180,7 +185,7 @@ func processCommandAliases(
 					}
 
 					commandToRun := fmt.Sprintf("%s %s %s", os.Args[0], aliasCmd, strings.Join(args, " "))
-					err = e.ExecuteShell(atmosConfig, commandToRun, commandToRun, ".", nil, false)
+					err = e.ExecuteShell(atmosConfig, commandToRun, commandToRun, currentDirPath, nil, false)
 					if err != nil {
 						u.LogErrorAndExit(err)
 					}
@@ -400,7 +405,7 @@ func executeCustomCommand(
 			// If the command to get the value for the ENV var is provided, execute it
 			if valCommand != "" {
 				valCommandName := fmt.Sprintf("env-var-%s-valcommand", key)
-				res, err := e.ExecuteShellAndReturnOutput(atmosConfig, valCommand, valCommandName, ".", nil, false)
+				res, err := e.ExecuteShellAndReturnOutput(atmosConfig, valCommand, valCommandName, currentDirPath, nil, false)
 				if err != nil {
 					u.LogErrorAndExit(err)
 				}
@@ -436,7 +441,7 @@ func executeCustomCommand(
 
 		// Execute the command step
 		commandName := fmt.Sprintf("%s-step-%d", commandConfig.Name, i)
-		err = e.ExecuteShell(atmosConfig, commandToRun, commandName, ".", envVarsList, false)
+		err = e.ExecuteShell(atmosConfig, commandToRun, commandName, currentDirPath, envVarsList, false)
 		if err != nil {
 			u.LogErrorAndExit(err)
 		}
@@ -523,6 +528,9 @@ func printMessageForMissingAtmosConfig(atmosConfig schema.AtmosConfiguration) {
 		u.LogErrorAndExit(err)
 	}
 
+	// Check if we're in a git repo. Warn if not.
+	verifyInsideGitRepo()
+
 	if atmosConfig.Default {
 		// If Atmos did not find an `atmos.yaml` config file and is using the default config
 		u.PrintMessageInColor("atmos.yaml", c1)
@@ -665,6 +673,31 @@ func getConfigAndStacksInfo(commandName string, cmd *cobra.Command, args []strin
 	return info
 }
 
+// isGitRepository checks if the current directory is within a git repository.
+func isGitRepository() bool {
+	_, err := git.PlainOpenWithOptions(currentDirPath, &git.PlainOpenOptions{
+		DetectDotGit: true,
+	})
+	if err != nil {
+		if !errors.Is(err, git.ErrRepositoryNotExists) {
+			log.Debug("git check failed", "error", err)
+		}
+		return false
+	}
+
+	return true
+}
+
+// verifyInsideGitRepo checks if we're in a git repo.
+func verifyInsideGitRepo() bool {
+	// Check if we're in a git repo
+	if !isGitRepository() {
+		log.Warn("You're not inside a git repository. Atmos feels lonely outside - bring it home!\n")
+		return false
+	}
+	return true
+}
+
 func showErrorExampleFromMarkdown(cmd *cobra.Command, arg string) {
 	commandPath := cmd.CommandPath()
 	suggestions := []string{}

cmd/cmd_utils_test.go

@@ -0,0 +1,68 @@
+package cmd
+
+import (
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestVerifyInsideGitRepo(t *testing.T) {
+	// Create a temporary directory for testing
+	tmpDir, err := os.MkdirTemp("", "git-repo-verify-test-*")
+	if err != nil {
+		t.Fatalf("Failed to create temp directory: %v", err)
+	}
+	defer os.RemoveAll(tmpDir)
+
+	// Save current working directory
+	currentDir, err := os.Getwd()
+	if err != nil {
+		t.Fatalf("Failed to get current directory: %v", err)
+	}
+
+	// Test cases
+	tests := []struct {
+		name     string
+		setup    func() error
+		expected bool
+	}{
+		{
+			name: "outside git repository",
+			setup: func() error {
+				return os.Chdir(tmpDir)
+			},
+			expected: false,
+		},
+		{
+			name: "inside git repository",
+			setup: func() error {
+				if err := os.Chdir(currentDir); err != nil {
+					return err
+				}
+				return nil
+			},
+			expected: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Setup test environment
+			if err := tt.setup(); err != nil {
+				t.Fatalf("Failed to setup test: %v", err)
+			}
+
+			// Run test
+			result := verifyInsideGitRepo()
+
+			// Assert result
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+
+	// Restore original working directory
+	if err := os.Chdir(currentDir); err != nil {
+		t.Fatalf("Failed to restore working directory: %v", err)
+	}
+}

cmd/terraform_generate_planfile.go

@@ -0,0 +1,42 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+
+	e "github.com/cloudposse/atmos/internal/exec"
+	u "github.com/cloudposse/atmos/pkg/utils"
+)
+
+// terraformGeneratePlanfileCmd generates planfile for a terraform component.
+var terraformGeneratePlanfileCmd = &cobra.Command{
+	Use:                "planfile",
+	Short:              "Generate a planfile for a Terraform component",
+	Long:               "This command generates a `planfile` for a specified Atmos Terraform component.",
+	FParseErrWhitelist: struct{ UnknownFlags bool }{UnknownFlags: false},
+	ValidArgsFunction:  ComponentsArgCompletion,
+	Run: func(cmd *cobra.Command, args []string) {
+		handleHelpRequest(cmd, args)
+		// Check Atmos configuration
+		checkAtmosConfig()
+
+		err := e.ExecuteTerraformGeneratePlanfileCmd(cmd, args)
+		if err != nil {
+			u.PrintErrorMarkdownAndExit("", err, "")
+		}
+	},
+}
+
+func init() {
+	terraformGeneratePlanfileCmd.DisableFlagParsing = false
+	AddStackCompletion(terraformGeneratePlanfileCmd)
+
+	terraformGeneratePlanfileCmd.PersistentFlags().StringP("file", "f", "", "Planfile name")
+	terraformGeneratePlanfileCmd.PersistentFlags().String("format", "json", "Output format (`json` or `yaml`, `json` is default)")
+
+	err := terraformGeneratePlanfileCmd.MarkPersistentFlagRequired("stack")
+	if err != nil {
+		u.PrintErrorMarkdownAndExit("", err, "")
+	}
+
+	terraformGenerateCmd.AddCommand(terraformGeneratePlanfileCmd)
+}

demo/screengrabs/demo-stacks.txt

@@ -32,6 +32,7 @@ atmos terraform deploy --help
 atmos terraform generate --help
 atmos terraform generate backend --help
 atmos terraform generate backends --help
+atmos terraform generate planfile --help
 atmos terraform generate varfile --help
 atmos terraform generate varfiles --help
 atmos terraform shell --help

examples/quick-start-advanced/Dockerfile

@@ -6,7 +6,7 @@ ARG GEODESIC_OS=debian
 # https://atmos.tools/
 # https://github.com/cloudposse/atmos
 # https://github.com/cloudposse/atmos/releases
-ARG ATMOS_VERSION=1.171.0
+ARG ATMOS_VERSION=1.173.0
 
 # Terraform: https://github.com/hashicorp/terraform/releases
 ARG TF_VERSION=1.5.7