cloudposse · milldr · Apr 22, 2025 · Jan 30, 2025 · Jan 30, 2025 · Jan 30, 2025
@@ -9,6 +9,7 @@
 	"strings"
 	"time"
 
+	log "github.com/charmbracelet/log"
 	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 
@@ -19,8 +20,12 @@
 	"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 @@
 					}
 
 					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 @@
 			// 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 @@
 
 		// 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 @@
 		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 @@
 	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{}

@@ -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)
+	}
+}
@@ -42,3 +42,81 @@ tests:
     expect:
       diff: []
       exit_code: 0
+
+  - name: atmos warns if not in git repo with no atmos config
+    enabled: true
+    snapshot: true
+    description: "Test that atmos warns if not run inside of a git repo without an atmos config"
+    workdir: "/"
+    command: "atmos"
+    args:
+      - list
+      - stacks
+    env:
+      ATMOS_LOGS_LEVEL: Warning
+    # Atmos should fail and include the git repo warning
+    expect:
+      diff: []
+      stderr:
+        - ".*You're not inside a git repository. Atmos feels lonely outside - bring it home!.*"
+      exit_code: 1 # We expect a non-zero exit code because the dir doesnt have an atmos config
+
+  # We need to test from outside a git repo. 
+  # We also need to provide a static path to the atmos config that can we used both in GHA and locally.
+  # To do so, we can change up 1 directory outside that atmos project and assume the project is named "atmos".
+  - name: atmos doesnt warn if not in git repo with atmos config
+    enabled: true
+    snapshot: true
+    description: "Test that atmos doesnt warn if not run inside of a git repo but has an atmos config"
+    workdir: "../../"
+    command: "atmos"
+    args:
      - list
+      - stacks
+    env:
+      ATMOS_LOGS_LEVEL: Warning
+      ATMOS_BASE_PATH: "./atmos/tests/fixtures/scenarios/complete"
+    # Atmos should pass and not include the git repo warning
+    expect:
+      diff: []
+      stdout:
+        - !not ".*You're not inside a git repository\\. Atmos feels lonely outside - bring it home!.*"
+      stderr:
+        - "^$"
+      exit_code: 0
+
+  - name: atmos doesnt warn if in git repo with atmos config
+    enabled: true
+    snapshot: true
+    description: "Test that atmos doesnt warn if run inside of a git repo with an atmos config"
+    workdir: "fixtures/scenarios/complete"
+    command: "atmos"
+    args:
+      - list
+      - stacks
+    env:
+      ATMOS_LOGS_LEVEL: Warning
+    # Atmos should pass and not include the git repo warning
+    expect:
+      diff: []
+      stdout:
+        - !not ".*You're not inside a git repository\\. Atmos feels lonely outside - bring it home!.*"
+      stderr:
+        - "^$"
+      exit_code: 0
+
+  - name: atmos doesnt warn if in git repo with no atmos config
+    enabled: true
+    snapshot: true
+    description: "Test that atmos doesnt warn if run inside of a git repo with no atmos config"
+    workdir: "fixtures/scenarios/empty-dir"
+    command: "atmos"
+    args: []
+    env:
+      ATMOS_LOGS_LEVEL: Warning
+    # Atmos should fail but not include the git repo warning
+    expect:
+      diff: []
+      stderr:
+        - !not ".*You're not inside a git repository\\. Atmos feels lonely outside - bring it home!.*"
+      exit_code: 1