Supported the atmos.d, allowing automatic inclusion of configuration files from the atmos.d directory

.github/workflows/test.yml

@@ -232,6 +232,7 @@ jobs:
           # - demo-component-manifest
           - demo-component-versions
           - demo-context
+          - demo-configuration
           # - demo-custom-command
           # - demo-json-validation
           # - demo-opa-validation

examples/demo-atmos-cli-imports/atmos.yaml

@@ -0,0 +1,9 @@
+# Description: This is an example of a custom import configuration file.
+# The import configuration file is used to load configurations from multiple files and directories.
+# The configurations are merged together to create a single configuration object.
+# The configurations are loaded in the order they are defined in the import section.
+base_path: "./"
+import:
+  - "https://raw.githubusercontent.com/cloudposse/atmos/refs/heads/main/atmos.yaml"  # Load from a remote URL
+  - "configs.d/**/*"                                                                 # Recursively load configurations from a directory
+  - "./logs.yaml"                                                                    # Load a specific file

examples/demo-atmos-cli-imports/configs.d/commands.yaml

@@ -0,0 +1,7 @@
+# Custom CLI commands
+commands:
+  - name: "test"
+    description: "Run all tests"
+    steps:
+      - atmos describe config  
+

examples/demo-atmos-cli-imports/configs.d/tools/stack.yml

@@ -0,0 +1,7 @@
+stacks:
+  base_path: "stacks"
+  included_paths:
+    - "deploy/**/*"
+  excluded_paths:
+    - "**/_defaults.yaml"
+  name_pattern: "{dev}"

examples/demo-atmos-cli-imports/configs.d/tools/terraform.yaml

@@ -0,0 +1,7 @@
+components:
+  terraform:
+    base_path: "components/terraform"
+    apply_auto_approve: true
+    deploy_run_init: true
+    init_run_reconfigure: true
+    auto_generate_backend_file: false

examples/demo-atmos-cli-imports/configs.d/vendor.yaml

@@ -0,0 +1,9 @@
+vendor:
+  # Single file
+  base_path: "./vendor.yaml"
+
+  # Directory with multiple files
+  #base_path: "./vendor"
+
+  # Absolute path
+  #base_path: "vendor.d/vendor1.yaml"

examples/demo-atmos-cli-imports/logs.yaml

@@ -0,0 +1,3 @@
+logs:
+  file: "/dev/stderr"
+  level: Debug

examples/demo-configuration/atmos.d/commands.yaml

@@ -0,0 +1,6 @@
+# Custom CLI commands
+commands:
+- name: "test"
+  description: "Run all tests with custom command"
+  steps:
+  - atmos describe config

examples/demo-configuration/atmos.d/logs.yaml

@@ -0,0 +1,3 @@
+logs:
+  file: "/dev/stderr"
+  level: Debug

examples/demo-configuration/atmos.d/tools/helmfile.yml

@@ -0,0 +1,17 @@
+components:
+  helmfile:
+    # Can also be set using 'ATMOS_COMPONENTS_HELMFILE_BASE_PATH' ENV var, or '--helmfile-dir' command-line argument
+    # Supports both absolute and relative paths
+    base_path: "components/helmfile"
+    # Can also be set using 'ATMOS_COMPONENTS_HELMFILE_USE_EKS' ENV var
+    # If not specified, defaults to 'true'
+    use_eks: true
+    # Can also be set using 'ATMOS_COMPONENTS_HELMFILE_KUBECONFIG_PATH' ENV var
+    kubeconfig_path: "/dev/shm"
+    # Can also be set using 'ATMOS_COMPONENTS_HELMFILE_HELM_AWS_PROFILE_PATTERN' ENV var
+    helm_aws_profile_pattern: "{namespace}-{tenant}-gbl-{stage}-helm"
+    # Can also be set using 'ATMOS_COMPONENTS_HELMFILE_CLUSTER_NAME_PATTERN' ENV var
+    cluster_name_pattern: "{namespace}-{tenant}-{environment}-{stage}-eks-cluster"
+
+
+

examples/demo-configuration/atmos.d/tools/stack.yaml

@@ -0,0 +1,7 @@
+stacks:
+  base_path: "stacks"
+  included_paths:
+    - "deploy/**/*"
+  excluded_paths:
+    - "**/_defaults.yaml"
+  name_pattern: "{dev}"

examples/demo-configuration/atmos.d/tools/terraform.yaml

@@ -0,0 +1,23 @@
+components:
+  terraform:
+    # Optional `command` specifies the executable to be called by `atmos` when running Terraform commands
+    # If not defined, `terraform` is used
+    # Examples:
+    # command: terraform
+    # command: /usr/local/bin/terraform
+    # command: /usr/local/bin/terraform-1.8
+    # command: tofu
+    # command: /usr/local/bin/tofu-1.7.1
+    # Can also be set using 'ATMOS_COMPONENTS_TERRAFORM_COMMAND' ENV var, or '--terraform-command' command-line argument
+    command: terraform
+    # Can also be set using 'ATMOS_COMPONENTS_TERRAFORM_BASE_PATH' ENV var, or '--terraform-dir' command-line argument
+    # Supports both absolute and relative paths
+    base_path: "components/terraform"
+    # Can also be set using 'ATMOS_COMPONENTS_TERRAFORM_APPLY_AUTO_APPROVE' ENV var
+    apply_auto_approve: false
+    # Can also be set using 'ATMOS_COMPONENTS_TERRAFORM_DEPLOY_RUN_INIT' ENV var, or '--deploy-run-init' command-line argument
+    deploy_run_init: true
+    # Can also be set using 'ATMOS_COMPONENTS_TERRAFORM_INIT_RUN_RECONFIGURE' ENV var, or '--init-run-reconfigure' command-line argument
+    init_run_reconfigure: true
+    # Can also be set using 'ATMOS_COMPONENTS_TERRAFORM_AUTO_GENERATE_BACKEND_FILE' ENV var, or '--auto-generate-backend-file' command-line argument
+    auto_generate_backend_file: true

examples/demo-configuration/atmos.yaml

@@ -0,0 +1,5 @@
+# Description: Configuration file for the Atmos CLI
+# default import path is ./atmos.d import .yaml files from the directory and merge them
+base_path: "./"
+
+

examples/demo-env/atmos.yaml

@@ -0,0 +1,21 @@
+base_path: "./"
+
+components:
+  terraform:
+    base_path: "components/terraform"
+    apply_auto_approve: false
+    deploy_run_init: true
+    init_run_reconfigure: true
+    auto_generate_backend_file: false
+
+stacks:
+  base_path: "stacks"
+  included_paths:
+    - "deploy/**/*"
+  excluded_paths:
+    - "**/_defaults.yaml"
+  name_pattern: "{stage}"
+
+logs:
+  file: "/dev/stderr"
+  level: Info

examples/demo-env/components/terraform/example/main.tf

@@ -0,0 +1,4 @@
+# Fetch the required environment variables using the `environment_variables` data source
+data "environment_variables" "required" {
+  filter = "ATMOS_.*" # Fetches all variables starting with "ATMOS_"
+}

examples/demo-env/components/terraform/example/outputs.tf

@@ -0,0 +1,15 @@
+# Output environment variables
+output "atmos_cli_config_path" {
+  value       = data.environment_variables.required.items["ATMOS_CLI_CONFIG_PATH"]
+  description = "The path to the Atmos CLI configuration file"
+}
+
+output "atmos_base_path" {
+  value       = data.environment_variables.required.items["ATMOS_BASE_PATH"]
+  description = "The base path used by Atmos"
+}
+
+output "example" {
+  value       = data.environment_variables.required.items["EXAMPLE"]
+  description = "Example environment variable"
+}

examples/demo-env/stacks/catalog/example.yaml

@@ -0,0 +1,10 @@
+# yaml-language-server: $schema=https://atmos.tools/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json
+env:
+  EXAMPLE: "test"
+
+components:
+  terraform:
+    example:
+      metadata:
+        component: example
+      vars: {}

examples/demo-env/stacks/deploy/dev.yaml

@@ -0,0 +1,12 @@
+# yaml-language-server: $schema=https://atmos.tools/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json
+
+vars:
+  stage: dev
+
+import:
+  - catalog/example
+
+components:
+  terraform:
+    example:
+      vars: {}

examples/demo-env/stacks/deploy/prod.yaml

@@ -0,0 +1,12 @@
+# yaml-language-server: $schema=https://atmos.tools/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json
+
+vars:
+  stage: prod
+
+import:
+  - catalog/example
+
+components:
+  terraform:
+    example:
+      vars: {}

examples/demo-env/stacks/deploy/staging.yaml

@@ -0,0 +1,12 @@
+# yaml-language-server: $schema=https://atmos.tools/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json
+
+vars:
+  stage: staging
+
+import:
+  - catalog/example
+
+components:
+  terraform:
+    example:
+      vars: {}

internal/exec/helmfile.go

@@ -244,6 +244,8 @@ func ExecuteHelmfile(info schema.ConfigAndStacksInfo) error {
 	if cliConfig.Components.Helmfile.UseEKS {
 		envVars = append(envVars, envVarsEKS...)
 	}
+	envVars = append(envVars, fmt.Sprintf("ATMOS_CLI_CONFIG_PATH=%s", cliConfig.CliConfigPath))
+	envVars = append(envVars, fmt.Sprintf("ATMOS_BASE_PATH=%s", cliConfig.BasePath))
 
 	u.LogTrace(cliConfig, "Using ENV vars:")
 	for _, v := range envVars {

internal/exec/terraform.go

@@ -231,6 +231,8 @@ func ExecuteTerraform(info schema.ConfigAndStacksInfo) error {
 		}
 	}
 
+	info.ComponentEnvList = append(info.ComponentEnvList, fmt.Sprintf("ATMOS_CLI_CONFIG_PATH=%s", cliConfig.CliConfigPath))
+	info.ComponentEnvList = append(info.ComponentEnvList, fmt.Sprintf("ATMOS_BASE_PATH=%s", cliConfig.BasePath))
 	// Set `TF_IN_AUTOMATION` ENV var to `true` to suppress verbose instructions after terraform commands
 	// https://developer.hashicorp.com/terraform/cli/config/environment-variables#tf_in_automation
 	info.ComponentEnvList = append(info.ComponentEnvList, "TF_IN_AUTOMATION=true")