Update providers and hooks sections (#1188)

* updates

* updates

* updates

* updates

* updates

* updates

Author: aknysh

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.169.0
+ARG ATMOS_VERSION=1.170.0
 
 # Terraform: https://github.com/hashicorp/terraform/releases
 ARG TF_VERSION=1.5.7

go.mod

@@ -41,7 +41,7 @@ func ExecuteAtmosCmd() error {
 
 	// Get a map of stacks and components in the stacks
 	// Don't process `Go` templates and YAML functions in Atmos stack manifests since we just need to display the stack and component names in the TUI
-	stacksMap, err := ExecuteDescribeStacks(atmosConfig, "", nil, nil, nil, false, true, true, false, nil)
+	stacksMap, err := ExecuteDescribeStacks(atmosConfig, "", nil, nil, nil, false, false, false, false, nil)
 	if err != nil {
 		return err
 	}

go.sum

@@ -1073,6 +1073,8 @@ func ProcessStackConfig(
 						baseComponentVars = baseComponentConfig.BaseComponentVars
 						baseComponentSettings = baseComponentConfig.BaseComponentSettings
 						baseComponentEnv = baseComponentConfig.BaseComponentEnv
+						baseComponentProviders = baseComponentConfig.BaseComponentProviders
+						baseComponentHooks = baseComponentConfig.BaseComponentHooks
 						baseComponentTerraformCommand = baseComponentConfig.BaseComponentCommand
 						baseComponentBackendType = baseComponentConfig.BaseComponentBackendType
 						baseComponentBackendSection = baseComponentConfig.BaseComponentBackendSection

internal/exec/atmos.go

@@ -1,6 +1,7 @@
 package exec
 
 import (
+	"path/filepath"
 	"sort"
 	"testing"
 
@@ -441,3 +442,66 @@ func TestProcessYAMLConfigFileInvalidHelmfileOverridesSection(t *testing.T) {
 
 	assert.Error(t, err)
 }
+
+func TestProcessStackConfigProviderSection(t *testing.T) {
+	basePath := filepath.Join("..", "..", "tests", "fixtures", "scenarios", "atmos-providers-section")
+	stacksBasePath := filepath.Join(basePath, "stacks")
+	manifest := filepath.Join(stacksBasePath, "deploy", "nonprod.yaml")
+
+	atmosConfig := schema.AtmosConfiguration{
+		Logs: schema.Logs{
+			Level: "Info",
+		},
+	}
+
+	deepMergedStackConfig, importsConfig, _, _, _, _, _, err := ProcessYAMLConfigFile(
+		atmosConfig,
+		stacksBasePath,
+		manifest,
+		map[string]map[string]any{},
+		nil,
+		false,
+		false,
+		true,
+		false,
+		nil,
+		nil,
+		nil,
+		nil,
+		"",
+	)
+	assert.Nil(t, err)
+
+	config, err := ProcessStackConfig(
+		atmosConfig,
+		stacksBasePath,
+		filepath.Join(basePath, "components", "terraform"),
+		filepath.Join(basePath, "components", "helmfile"),
+		"nonprod",
+		deepMergedStackConfig,
+		false,
+		false,
+		"",
+		map[string]map[string][]string{},
+		importsConfig,
+		true,
+	)
+	assert.Nil(t, err)
+
+	providers, err := u.EvaluateYqExpression(&atmosConfig, config, ".components.terraform.component-2.providers")
+	assert.Nil(t, err)
+
+	awsProvider, err := u.EvaluateYqExpression(&atmosConfig, providers, ".aws")
+	assert.Nil(t, err)
+
+	contextProvider, err := u.EvaluateYqExpression(&atmosConfig, providers, ".context")
+	assert.Nil(t, err)
+
+	awsProviderRoleArn, err := u.EvaluateYqExpression(&atmosConfig, awsProvider, ".assume_role.role_arn")
+	assert.Nil(t, err)
+	assert.Equal(t, "Derived component IAM Role ARN", awsProviderRoleArn)
+
+	contextProviderPropertyOrder0, err := u.EvaluateYqExpression(&atmosConfig, contextProvider, ".property_order[0]")
+	assert.Nil(t, err)
+	assert.Equal(t, "product", contextProviderPropertyOrder0)
+}

internal/exec/stack_processor_utils.go

@@ -252,7 +252,7 @@ func mergeDefaultImports(dirPath string, dst *viper.Viper) error {
 	searchDir := filepath.Join(filepath.FromSlash(dirPath), filepath.Join("atmos.d", "**", "*"))
 	foundPaths1, err := SearchAtmosConfig(searchDir)
 	if err != nil {
-		log.Debug("Failed to find atmos config file", "path", searchDir, "error", err)
+		log.Debug("Atmos configuration not found", "path", searchDir, "error", err)
 	}
 	if len(foundPaths1) > 0 {
 		atmosFoundFilePaths = append(atmosFoundFilePaths, foundPaths1...)
@@ -261,7 +261,7 @@ func mergeDefaultImports(dirPath string, dst *viper.Viper) error {
 	searchDir = filepath.Join(filepath.FromSlash(dirPath), filepath.Join(".atmos.d", "**", "*"))
 	foundPaths2, err := SearchAtmosConfig(searchDir)
 	if err != nil {
-		log.Debug("Failed to find atmos config file", "path", searchDir, "error", err)
+		log.Debug("Atmos configuration not found", "path", searchDir, "error", err)
 	}
 	if len(foundPaths2) > 0 {
 		atmosFoundFilePaths = append(atmosFoundFilePaths, foundPaths2...)

internal/exec/stack_processor_utils_test.go

@@ -0,0 +1,38 @@
+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_template: "{{ .vars.stage }}"
+
+logs:
+  file: "/dev/stderr"
+  level: Info
+
+# `Go` templates in Atmos manifests
+# https://atmos.tools/core-concepts/stacks/templates
+# https://pkg.go.dev/text/template
+templates:
+  settings:
+    enabled: true
+    evaluations: 1
+    # https://masterminds.github.io/sprig
+    sprig:
+      enabled: true
+    # https://docs.gomplate.ca
+    gomplate:
+      enabled: true
+      timeout: 10
+      # https://docs.gomplate.ca/datasources
+      datasources: {}

pkg/config/load.go

@@ -0,0 +1,38 @@
+# yaml-language-server: $schema=https://atmos.tools/schemas/atmos/atmos-manifest/1.0/atmos-manifest.json
+
+vars:
+  stage: nonprod
+
+components:
+  terraform:
+    component-1:
+      metadata:
+        type: abstract
+      vars:
+        foo: component-1-foo
+        bar: component-1-bar
+        baz: component-1-baz
+      providers:
+        aws:
+          assume_role:
+            role_arn: "Base component IAM Role ARN"
+        context:
+          enabled: true
+          delimiter: "-"
+          property_order:
+            - product
+            - region
+            - environment
+            - name
+
+    component-2:
+      metadata:
+        component: mock
+        inherits:
+          - component-1
+      vars:
+        foo: component-2-foo
+      providers:
+        aws:
+          assume_role:
+            role_arn: "Derived component IAM Role ARN"

tests/fixtures/scenarios/atmos-providers-section/atmos.yaml

@@ -35,4 +35,4 @@ templates:
       enabled: true
       timeout: 10
       # https://docs.gomplate.ca/datasources
-      datasources: { }
+      datasources: {}