Merge branch 'DEV-2778-version' of github.com:cloudposse/atmos into D…

…EV-2778-version

.github/workflows/test.yml

@@ -298,25 +298,25 @@ jobs:
           - { os: windows-latest, target: windows }
           - { os: macos-latest, target: macos }
         demo-folder:
-          - demo-atlantis
-          # - demo-component-manifest
-          - demo-component-versions
-          - demo-context
-          # - demo-custom-command
-          # - demo-json-validation
-          # - demo-opa-validation
-          # - demo-opentofu
-          # - demo-project
-          # - demo-stacks
-          # - demo-terraform
-          # - demo-terraform-overrides
-          # - demo-workflows
-          # - demo-yaml-anchors
-          # - demo-mock-architecture
-          # - demo-stack-templating
-          # - demo-multi-cloud
-          - demo-vendoring
-          - tests
+          - examples/demo-atlantis
+          # - examples/demo-component-manifest
+          - examples/demo-component-versions
+          - examples/demo-context
+          # - examples/demo-custom-command
+          # - examples/demo-json-validation
+          # - examples/demo-opa-validation
+          # - examples/demo-opentofu
+          # - examples/demo-project
+          # - examples/demo-stacks
+          # - examples/demo-terraform
+          # - examples/demo-terraform-overrides
+          # - examples/demo-workflows
+          # - examples/demo-yaml-anchors
+          # - examples/demo-mock-architecture
+          # - examples/demo-stack-templating
+          # - examples/demo-multi-cloud
+          - examples/demo-vendoring
+          - tests/fixtures/scenarios/complete
 
     timeout-minutes: 20
     steps:
@@ -350,7 +350,7 @@ jobs:
           terraform_wrapper: false
 
       - name: Run tests in ${{ matrix.demo-folder }} for ${{ matrix.flavor.target }}
-        working-directory: examples/${{ matrix.demo-folder }}
+        working-directory: ${{ matrix.demo-folder }}
         if: matrix.flavor.target == 'linux' || matrix.flavor.target == 'macos'
         run: |
           atmos test
@@ -366,7 +366,7 @@ jobs:
           atmos version
 
       - name: Run tests in ${{ matrix.demo-folder }} for ${{ matrix.flavor.target }}
-        working-directory: examples/${{ matrix.demo-folder }}
+        working-directory: ${{ matrix.demo-folder }}
         if: matrix.flavor.target == 'windows'
         shell: pwsh
         run: |

internal/exec/shell_utils.go

@@ -21,6 +21,30 @@ import (
 	u "github.com/cloudposse/atmos/pkg/utils"
 )
 
+// MaxShellDepth is the maximum number of nested shell commands that can be executed
+const MaxShellDepth = 10
+
+// getNextShellLevel increments the ATMOS_SHLVL and returns the new value or an error if maximum depth is exceeded
+func getNextShellLevel() (int, error) {
+	atmosShellLvl := os.Getenv("ATMOS_SHLVL")
+	shellVal := 0
+	if atmosShellLvl != "" {
+		val, err := strconv.Atoi(atmosShellLvl)
+		if err != nil {
+			return 0, fmt.Errorf("invalid ATMOS_SHLVL value: %s", atmosShellLvl)
+		}
+		shellVal = val
+	}
+
+	shellVal++
+
+	if shellVal > MaxShellDepth {
+		return 0, fmt.Errorf("ATMOS_SHLVL (%d) exceeds maximum allowed depth (%d). Infinite recursion?",
+			shellVal, MaxShellDepth)
+	}
+	return shellVal, nil
+}
+
 // ExecuteShellCommand prints and executes the provided command with args and flags
 func ExecuteShellCommand(
 	atmosConfig schema.AtmosConfiguration,
@@ -31,8 +55,14 @@ func ExecuteShellCommand(
 	dryRun bool,
 	redirectStdError string,
 ) error {
+	newShellLevel, err := getNextShellLevel()
+	if err != nil {
+		return err
+	}
+	updatedEnv := append(env, fmt.Sprintf("ATMOS_SHLVL=%d", newShellLevel))
+
 	cmd := exec.Command(command, args...)
-	cmd.Env = append(os.Environ(), env...)
+	cmd.Env = append(os.Environ(), updatedEnv...)
 	cmd.Dir = dir
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
@@ -83,14 +113,20 @@ func ExecuteShell(
 	env []string,
 	dryRun bool,
 ) error {
+	newShellLevel, err := getNextShellLevel()
+	if err != nil {
+		return err
+	}
+	updatedEnv := append(env, fmt.Sprintf("ATMOS_SHLVL=%d", newShellLevel))
+
 	u.LogDebug(atmosConfig, "\nExecuting command:")
 	u.LogDebug(atmosConfig, command)
 
 	if dryRun {
 		return nil
 	}
 
-	return shellRunner(command, name, dir, env, os.Stdout)
+	return shellRunner(command, name, dir, updatedEnv, os.Stdout)
 }
 
 // ExecuteShellAndReturnOutput runs a shell script and capture its standard output
@@ -104,14 +140,20 @@ func ExecuteShellAndReturnOutput(
 ) (string, error) {
 	var b bytes.Buffer
 
+	newShellLevel, err := getNextShellLevel()
+	if err != nil {
+		return "", err
+	}
+	updatedEnv := append(env, fmt.Sprintf("ATMOS_SHLVL=%d", newShellLevel))
+
 	u.LogDebug(atmosConfig, "\nExecuting command:")
 	u.LogDebug(atmosConfig, command)
 
 	if dryRun {
 		return "", nil
 	}
 
-	err := shellRunner(command, name, dir, env, &b)
+	err = shellRunner(command, name, dir, updatedEnv, &b)
 	if err != nil {
 		return "", err
 	}

pkg/atlantis/README.md

@@ -122,7 +122,7 @@ projects:
   - name: tenant1-ue2-staging-test-test-component-override-3
     workspace: test-component-override-3-workspace
     workflow: workflow-1
-    dir: examples/tests/components/terraform/test/test-component
+    dir: tests/fixtures/scenarios/complete/components/terraform/test/test-component
     terraform_version: v1.2
     delete_source_branch_on_merge: true
     autoplan:
@@ -135,7 +135,7 @@ projects:
   - name: tenant1-ue2-staging-infra-vpc
     workspace: tenant1-ue2-staging
     workflow: workflow-1
-    dir: examples/tests/components/terraform/infra/vpc
+    dir: tests/fixtures/scenarios/complete/components/terraform/infra/vpc
     terraform_version: v1.2
     delete_source_branch_on_merge: true
     autoplan:

pkg/atlantis/atmos.yaml

@@ -15,7 +15,7 @@
 # are independent settings (supporting both absolute and relative paths).
 # If 'base_path' is provided, 'components.terraform.base_path', 'components.helmfile.base_path', 'stacks.base_path' and 'workflows.base_path'
 # are considered paths relative to 'base_path'.
-base_path: "../../examples/tests"
+base_path: "../../tests/fixtures/scenarios/complete"
 
 components:
   terraform:

pkg/aws/atmos.yaml

@@ -15,7 +15,7 @@
 # are independent settings (supporting both absolute and relative paths).
 # If 'base_path' is provided, 'components.terraform.base_path', 'components.helmfile.base_path', 'stacks.base_path' and 'workflows.base_path'
 # are considered paths relative to 'base_path'.
-base_path: "../../examples/tests"
+base_path: "../../tests/fixtures/scenarios/complete"
 
 components:
   terraform:

pkg/component/atmos.yaml

@@ -15,7 +15,7 @@
 # are independent settings (supporting both absolute and relative paths).
 # If 'base_path' is provided, 'components.terraform.base_path', 'components.helmfile.base_path', 'stacks.base_path' and 'workflows.base_path'
 # are considered paths relative to 'base_path'.
-base_path: "../../examples/tests"
+base_path: "../../tests/fixtures/scenarios/complete"
 
 components:
   terraform:

pkg/describe/atmos.yaml

@@ -15,7 +15,7 @@
 # are independent settings (supporting both absolute and relative paths).
 # If 'base_path' is provided, 'components.terraform.base_path', 'components.helmfile.base_path', 'stacks.base_path' and 'workflows.base_path'
 # are considered paths relative to 'base_path'.
-base_path: "../../examples/tests"
+base_path: "../../tests/fixtures/scenarios/complete"
 
 components:
   terraform:

pkg/describe/describe_affected_test.go

@@ -18,10 +18,10 @@ func TestDescribeAffectedWithTargetRefClone(t *testing.T) {
 	atmosConfig, err := cfg.InitCliConfig(configAndStacksInfo, true)
 	assert.Nil(t, err)
 
-	// We are using `atmos.yaml` from this dir. This `atmos.yaml` has set base_path: "../../examples/tests",
+	// We are using `atmos.yaml` from this dir. This `atmos.yaml` has set base_path: "../../tests/fixtures/scenarios/complete",
 	// which will be wrong for the remote repo which is cloned into a temp dir.
 	// Set the correct base path for the cloned remote repo
-	atmosConfig.BasePath = "./examples/tests"
+	atmosConfig.BasePath = "./tests/fixtures/scenarios/complete"
 
 	// Git reference and commit SHA
 	// Refer to https://git-scm.com/book/en/v2/Git-Internals-Git-References for more details
@@ -53,10 +53,10 @@ func TestDescribeAffectedWithTargetRepoPath(t *testing.T) {
 	atmosConfig, err := cfg.InitCliConfig(configAndStacksInfo, true)
 	assert.Nil(t, err)
 
-	// We are using `atmos.yaml` from this dir. This `atmos.yaml` has set base_path: "../../examples/tests",
+	// We are using `atmos.yaml` from this dir. This `atmos.yaml` has set base_path: "../../tests/fixtures/scenarios/complete",
 	// which will be wrong for the remote repo which is cloned into a temp dir.
 	// Set the correct base path for the cloned remote repo
-	atmosConfig.BasePath = "./examples/tests"
+	atmosConfig.BasePath = "./tests/fixtures/scenarios/complete"
 
 	// Point to the same local repository
 	// This will compare this local repository with itself as the remote target, which should result in an empty `affected` list

pkg/generate/atmos.yaml

@@ -15,7 +15,7 @@
 # are independent settings (supporting both absolute and relative paths).
 # If 'base_path' is provided, 'components.terraform.base_path', 'components.helmfile.base_path', 'stacks.base_path' and 'workflows.base_path'
 # are considered paths relative to 'base_path'.
-base_path: "../../examples/tests"
+base_path: "../../tests/fixtures/scenarios/complete"
 
 components:
   terraform:

pkg/list/atmos.yaml

@@ -15,7 +15,7 @@
 # are independent settings (supporting both absolute and relative paths).
 # If 'base_path' is provided, 'components.terraform.base_path', 'components.helmfile.base_path', 'stacks.base_path' and 'workflows.base_path'
 # are considered paths relative to 'base_path'.
-base_path: "../../examples/tests"
+base_path: "../../tests/fixtures/scenarios/complete"
 
 components:
   terraform:

pkg/spacelift/atmos.yaml

@@ -15,7 +15,7 @@
 # are independent settings (supporting both absolute and relative paths).
 # If 'base_path' is provided, 'components.terraform.base_path', 'components.helmfile.base_path', 'stacks.base_path' and 'workflows.base_path'
 # are considered paths relative to 'base_path'.
-base_path: "../../examples/tests"
+base_path: "../../tests/fixtures/scenarios/complete"
 
 components:
   terraform:

pkg/spacelift/spacelift_stack_processor_test.go

@@ -104,18 +104,18 @@ func TestSpaceliftStackProcessor(t *testing.T) {
 }
 
 func TestLegacySpaceliftStackProcessor(t *testing.T) {
-	stacksBasePath := "../../examples/tests/stacks"
-	terraformComponentsBasePath := "../../examples/tests/components/terraform"
-	helmfileComponentsBasePath := "../../examples/tests/components/helmfile"
+	stacksBasePath := "../../tests/fixtures/scenarios/complete/stacks"
+	terraformComponentsBasePath := "../../tests/fixtures/scenarios/complete/components/terraform"
+	helmfileComponentsBasePath := "../../tests/fixtures/scenarios/complete/components/helmfile"
 
 	filePaths := []string{
-		"../../examples/tests/stacks/orgs/cp/tenant1/dev/us-east-2.yaml",
-		"../../examples/tests/stacks/orgs/cp/tenant1/prod/us-east-2.yaml",
-		"../../examples/tests/stacks/orgs/cp/tenant1/staging/us-east-2.yaml",
-		"../../examples/tests/stacks/orgs/cp/tenant1/test1/us-east-2.yaml",
-		"../../examples/tests/stacks/orgs/cp/tenant2/dev/us-east-2.yaml",
-		"../../examples/tests/stacks/orgs/cp/tenant2/prod/us-east-2.yaml",
-		"../../examples/tests/stacks/orgs/cp/tenant2/staging/us-east-2.yaml",
+		"../../tests/fixtures/scenarios/complete/stacks/orgs/cp/tenant1/dev/us-east-2.yaml",
+		"../../tests/fixtures/scenarios/complete/stacks/orgs/cp/tenant1/prod/us-east-2.yaml",
+		"../../tests/fixtures/scenarios/complete/stacks/orgs/cp/tenant1/staging/us-east-2.yaml",
+		"../../tests/fixtures/scenarios/complete/stacks/orgs/cp/tenant1/test1/us-east-2.yaml",
+		"../../tests/fixtures/scenarios/complete/stacks/orgs/cp/tenant2/dev/us-east-2.yaml",
+		"../../tests/fixtures/scenarios/complete/stacks/orgs/cp/tenant2/prod/us-east-2.yaml",
+		"../../tests/fixtures/scenarios/complete/stacks/orgs/cp/tenant2/staging/us-east-2.yaml",
 	}
 
 	processStackDeps := true

pkg/stack/stack_processor_test.go

@@ -10,15 +10,15 @@ import (
 )
 
 func TestStackProcessor(t *testing.T) {
-	stacksBasePath := "../../examples/tests/stacks"
-	terraformComponentsBasePath := "../../examples/tests/components/terraform"
-	helmfileComponentsBasePath := "../../examples/tests/components/helmfile"
+	stacksBasePath := "../../tests/fixtures/scenarios/complete/stacks"
+	terraformComponentsBasePath := "../../tests/fixtures/scenarios/complete/components/terraform"
+	helmfileComponentsBasePath := "../../tests/fixtures/scenarios/complete/components/helmfile"
 
 	filePaths := []string{
-		"../../examples/tests/stacks/orgs/cp/tenant1/dev/us-east-2.yaml",
-		"../../examples/tests/stacks/orgs/cp/tenant1/prod/us-east-2.yaml",
-		"../../examples/tests/stacks/orgs/cp/tenant1/staging/us-east-2.yaml",
-		"../../examples/tests/stacks/orgs/cp/tenant1/test1/us-east-2.yaml",
+		"../../tests/fixtures/scenarios/complete/stacks/orgs/cp/tenant1/dev/us-east-2.yaml",
+		"../../tests/fixtures/scenarios/complete/stacks/orgs/cp/tenant1/prod/us-east-2.yaml",
+		"../../tests/fixtures/scenarios/complete/stacks/orgs/cp/tenant1/staging/us-east-2.yaml",
+		"../../tests/fixtures/scenarios/complete/stacks/orgs/cp/tenant1/test1/us-east-2.yaml",
 	}
 
 	processStackDeps := true

pkg/validate/atmos.yaml

@@ -15,7 +15,7 @@
 # are independent settings (supporting both absolute and relative paths).
 # If 'base_path' is provided, 'components.terraform.base_path', 'components.helmfile.base_path', 'stacks.base_path' and 'workflows.base_path'
 # are considered paths relative to 'base_path'.
-base_path: "../../examples/tests"
+base_path: "../../tests/fixtures/scenarios/complete"
 
 components:
   terraform:

pkg/vender/atmos.yaml

@@ -15,7 +15,7 @@
 # are independent settings (supporting both absolute and relative paths).
 # If 'base_path' is provided, 'components.terraform.base_path', 'components.helmfile.base_path', 'stacks.base_path' and 'workflows.base_path'
 # are considered paths relative to 'base_path'.
-base_path: "../../examples/tests"
+base_path: "../../tests/fixtures/scenarios/complete"
 
 components:
   terraform:

pkg/workflow/atmos.yaml

@@ -15,7 +15,7 @@
 # are independent settings (supporting both absolute and relative paths).
 # If 'base_path' is provided, 'components.terraform.base_path', 'components.helmfile.base_path', 'stacks.base_path' and 'workflows.base_path'
 # are considered paths relative to 'base_path'.
-base_path: "../../examples/tests"
+base_path: "../../tests/fixtures/scenarios/complete"
 
 components:
   terraform:

examples/tests/atmos.yaml → tests/fixtures/scenarios/complete/atmos.yaml

@@ -96,6 +96,13 @@ commands:
     steps:
       - atmos vendor pull
 
+  # test for infinite loop
+  - name: loop
+    description: This command tests circuit breaker for infinite loop
+    steps:
+      - "echo Hello world!"
+      - atmos loop
+
   - name: tf
     description: Execute 'terraform' commands
     # subcommands
@@ -343,7 +350,7 @@ schemas:
   atmos:
     # Can also be set using 'ATMOS_SCHEMAS_ATMOS_MANIFEST' ENV var, or '--schemas-atmos-manifest' command-line argument
     # Supports both absolute and relative paths (relative to the `base_path` setting in `atmos.yaml`)
-    manifest: "../quick-start-advanced/stacks/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
+    manifest: "../../schemas/atmos/atmos-manifest/1.0/atmos-manifest.json"
 
 # CLI command aliases
 aliases:

examples/tests/components/terraform/infra/vpc-flow-logs-bucket/component.yaml → tests/fixtures/scenarios/complete/components/terraform/infra/vpc-flow-logs-bucket/component.yaml

@@ -5,7 +5,7 @@
 
 # > atmos vendor pull -c infra/vpc-flow-logs-bucket
 # Pulling sources for the component 'infra/vpc-flow-logs-bucket' from 'github.com/cloudposse/terraform-aws-components.git//modules/vpc-flow-logs-bucket?ref=0.194.0'
-#  into 'examples/tests/components/terraform/infra/vpc-flow-logs-bucket'
+#  into 'tests/fixtures/scenarios/complete/components/terraform/infra/vpc-flow-logs-bucket'
 #
 #  Including the file 'README.md' since it matches the '**/*.md' pattern from 'included_paths'
 #  Excluding the file 'context.tf' since it matches the '**/context.tf' pattern from 'excluded_paths'
@@ -17,9 +17,9 @@
 #  Including the file 'versions.tf' since it matches the '**/*.tf' pattern from 'included_paths'
 #
 # Pulling the mixin 'https://raw.githubusercontent.com/cloudposse/terraform-null-label/0.25.0/exports/context.tf'
-#  for the component 'infra/vpc-flow-logs-bucket' into 'examples/tests/components/terraform/infra/vpc-flow-logs-bucket'
+#  for the component 'infra/vpc-flow-logs-bucket' into 'tests/fixtures/scenarios/complete/components/terraform/infra/vpc-flow-logs-bucket'
 # Pulling the mixin 'https://raw.githubusercontent.com/cloudposse/terraform-aws-components/0.194.0/modules/datadog-agent/introspection.mixin.tf'
-#  for the component 'infra/vpc-flow-logs-bucket' into 'examples/tests/components/terraform/infra/vpc-flow-logs-bucket'
+#  for the component 'infra/vpc-flow-logs-bucket' into 'tests/fixtures/scenarios/complete/components/terraform/infra/vpc-flow-logs-bucket'
 
 apiVersion: atmos/v1
 kind: ComponentVendorConfig

examples/tests/stacks/catalog/terraform/top-level-component3.yaml → tests/fixtures/scenarios/complete/stacks/catalog/terraform/top-level-component3.yaml

@@ -13,8 +13,8 @@ components:
           workspace_enabled: false
         depends_on:
           1:
-            file: "examples/tests/components/terraform/mixins/introspection.mixin.tf"
+            file: "tests/fixtures/scenarios/complete/components/terraform/mixins/introspection.mixin.tf"
           2:
-            folder: "examples/tests/components/helmfile/infra/infra-server"
+            folder: "tests/fixtures/scenarios/complete/components/helmfile/infra/infra-server"
       vars:
         enabled: true