updates

cloudposse · Dec 5, 2024 · cb1b68e · cb1b68e
1 parent 0ff08d5
commit cb1b68e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 31 deletions.
diff --git a/atmos.yaml b/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: "."
+base_path: "./examples/tests"
 
 vendor:
   # Path to vendor configuration file or directory containing vendor files

diff --git a/examples/tests/stacks/catalog/terraform/template-functions-test2/defaults.yaml b/examples/tests/stacks/catalog/terraform/template-functions-test2/defaults.yaml
@@ -6,6 +6,7 @@ components:
       metadata:
         # Point to the Terraform component
         component: "test/template-functions-test2"
+        terraform_workspace: '{{ .vars.tenant }}-{{ .vars.environment }}-{{ .vars.stage }}'
       settings:
         spacelift:
           workspace_enabled: false

diff --git a/examples/tests/stacks/orgs/cp/_defaults.yaml b/examples/tests/stacks/orgs/cp/_defaults.yaml
@@ -56,34 +56,34 @@ terraform:
     s3:
       role_arn: "arn:aws:iam::123456789012:role/cp-gbl-root-terraform"
 
-  providers:
-    context:
-      enabled: true
-      delimiter: "-"
-      properties:
-        namespace:
-          required: true
-          min_length: 2
-          max_length: 4
-        tenant:
-          required: true
-          min_length: 2
-          max_length: 10
-        environment:
-          required: true
-          min_length: 2
-          max_length: 6
-        stage:
-          required: true
-          min_length: 2
-          max_length: 20
-      values:
-        namespace: "{{ .vars.namespace }}"
-        tenant: "{{ .vars.tenant }}"
-        environment: "{{ .vars.environment }}"
-        stage: "{{ .vars.stage }}"
-        atmos_component: "{{ .atmos_component }}"
-        atmos_stack: "{{ .atmos_stack }}"
+#  providers:
+#    context:
+#      enabled: true
+#      delimiter: "-"
+#      properties:
+#        namespace:
+#          required: true
+#          min_length: 2
+#          max_length: 4
+#        tenant:
+#          required: true
+#          min_length: 2
+#          max_length: 10
+#        environment:
+#          required: true
+#          min_length: 2
+#          max_length: 6
+#        stage:
+#          required: true
+#          min_length: 2
+#          max_length: 20
+#      values:
+#        namespace: "{{ .vars.namespace }}"
+#        tenant: "{{ .vars.tenant }}"
+#        environment: "{{ .vars.environment }}"
+#        stage: "{{ .vars.stage }}"
+#        atmos_component: "{{ .atmos_component }}"
+#        atmos_stack: "{{ .atmos_stack }}"
 
 helmfile:
   vars: {}

diff --git a/examples/tests/stacks/orgs/cp/tenant1/prod/us-east-2.yaml b/examples/tests/stacks/orgs/cp/tenant1/prod/us-east-2.yaml
@@ -15,8 +15,8 @@ import:
   - catalog/terraform/spacelift/infrastructure-tenant1
 
   # Configurations to test `atmos.Component` template function
-  # - catalog/terraform/template-functions-test/defaults
-  # - catalog/terraform/template-functions-test2/defaults
+  - catalog/terraform/template-functions-test/defaults
+  - catalog/terraform/template-functions-test2/defaults
 
 components:
   terraform: