feat: move stack related names from context for compatibility with te…

…rraform-null-label resource (#151)

components/terraform/alb/providers.tf

@@ -7,7 +7,7 @@ provider "oci" {
 }
 
 provider "context" {
-  enabled   = var.context.enabled
+  enabled   = var.enabled
   delimiter = "-"
   property_order = [
     "namespace",
@@ -33,9 +33,9 @@ provider "context" {
   }
   tags_key_case = "title"
   values = {
-    namespace   = var.context.namespace
-    stage       = var.context.stage
-    environment = var.context.environment
-    name        = var.context.name
+    namespace   = var.namespace
+    stage       = var.stage
+    environment = var.environment
+    name        = var.name
   }
 }

components/terraform/alb/variables.tf

@@ -22,14 +22,24 @@ variable "compartment_ocid" {
   type = string
 }
 
-variable "context" {
-  type = object({
-    enabled     = bool
-    namespace   = string
-    stage       = string
-    environment = string
-    name        = string
-  })
+variable "enabled" {
+  type = bool
+}
+
+variable "namespace" {
+  type = string
+}
+
+variable "stage" {
+  type = string
+}
+
+variable "environment" {
+  type = string
+}
+
+variable "name" {
+  type = string
 }
 
 variable "vault_cert_private_key" {

components/terraform/vcn/providers.tf

@@ -7,7 +7,7 @@ provider "oci" {
 }
 
 provider "context" {
-  enabled   = var.context.enabled
+  enabled   = var.enabled
   delimiter = "-"
   property_order = [
     "namespace",
@@ -33,9 +33,9 @@ provider "context" {
   }
   tags_key_case = "title"
   values = {
-    namespace   = var.context.namespace
-    stage       = var.context.stage
-    environment = var.context.environment
-    name        = var.context.name
+    namespace   = var.namespace
+    stage       = var.stage
+    environment = var.environment
+    name        = var.name
   }
 }

components/terraform/vcn/variables.tf

@@ -18,14 +18,24 @@ variable "region" {
   type = string
 }
 
-variable "context" {
-  type = object({
-    enabled     = bool
-    namespace   = string
-    stage       = string
-    environment = string
-    name        = string
-  })
+variable "enabled" {
+  type = bool
+}
+
+variable "namespace" {
+  type = string
+}
+
+variable "stage" {
+  type = string
+}
+
+variable "environment" {
+  type = string
+}
+
+variable "name" {
+  type = string
 }
 
 variable "compartment_ocid" {

rootfs/usr/local/etc/atmos/atmos.yaml

@@ -14,7 +14,7 @@ stacks:
     - "orgs/**/*"
   excluded_paths:
     - "**/_defaults.yaml"
-  name_template: "{{.vars.context.namespace}}-{{.vars.context.tenant}}-{{.vars.context.stage}}-{{.vars.context.environment}}"
+  name_template: "{{.vars.namespace}}-{{.vars.tenant}}-{{.vars.stage}}-{{.vars.environment}}"
   name_pattern: "{namespace}-{tenant}-{stage}-{environment}" # data "utils_component_config" not compatible with name_template in .atmos.yaml config file
 
 logs:

stacks/catalog/alb/defaults.yaml

@@ -2,5 +2,4 @@ components:
   terraform:
     alb:
       vars:
-        context:
-          enabled: true
+        enabled: true

stacks/catalog/vcn/defaults.yaml

@@ -2,5 +2,4 @@ components:
   terraform:
     vcn:
       vars:
-        context:
-          enabled: true
+        enabled: true

stacks/mixins/region/fra.yaml

@@ -4,5 +4,4 @@ import:
 
 vars:
   region: eu-frankfurt-1
-  context:
-    environment: fra
+  environment: fra

stacks/mixins/stage/dev.yaml

@@ -1,3 +1,2 @@
 vars:
-  context:
-    stage: dev
+  stage: dev

stacks/mixins/stage/prod.yaml

@@ -1,3 +1,2 @@
 vars:
-  context:
-    stage: prod
+  stage: prod

stacks/mixins/stage/stage.yaml

@@ -1,3 +1,2 @@
 vars:
-  context:
-    stage: stage
+  stage: stage

stacks/mixins/tenant/core.yaml

@@ -1,3 +1,2 @@
 vars:
-  context:
-    tenant: core
+  tenant: core

stacks/mixins/tenant/plat.yaml

@@ -1,3 +1,2 @@
 vars:
-  context:
-    tenant: plat
+  tenant: plat

stacks/orgs/hs/_defaults.yaml

@@ -1,3 +1,2 @@
 vars:
-  context:
-    namespace: hs
+  namespace: hs

stacks/orgs/hs/plat/prod/fra.yaml

@@ -8,8 +8,7 @@ components:
       metadata:
         component: vcn
       vars:
-        context:
-          name: network
+        name: network
         vcn:
           name: vcn
           ipv4_cidr_blocks:
@@ -29,10 +28,7 @@ components:
       metadata:
         component: alb
       vars:
-        context:
-          name: alb
-        alb:
-          name: alb
+        name: alb
         vault_ca_cert: |
           -----BEGIN CERTIFICATE-----
           MIIFFzCCAv+gAwIBAgIUI28rXTkTMeRm+EQuTTQTBS79J+YwDQYJKoZIhvcNAQEL