Merge branch 'master' into fast-dev

modules/project/organization-policies.tf

@@ -31,21 +31,49 @@ locals {
       rules = [
         for r in try(v.rules, []) : {
           allow = can(r.allow) ? {
-            all    = try(r.allow.all, null)
-            values = try(r.allow.values, null)
+            all = try(r.allow.all, null)
+            values = (
+              can(r.allow.values)
+              ? [for x in r.allow.values : templatestring(x, var.factories_config.context.org_policies)]
+              : null
+            )
           } : null
           deny = can(r.deny) ? {
-            all    = try(r.deny.all, null)
-            values = try(r.deny.values, null)
+            all = try(r.deny.all, null)
+            values = (
+              can(r.deny.values)
+              ? [for x in r.deny.values : templatestring(x, var.factories_config.context.org_policies)]
+              : null
+            )
           } : null
           enforce = try(r.enforce, null)
           condition = {
-            description = try(r.condition.description, null)
-            expression  = try(r.condition.expression, null)
-            location    = try(r.condition.location, null)
-            title       = try(r.condition.title, null)
+            description = (
+              can(r.condition.description)
+              ? templatestring(r.condition.description, var.factories_config.context.org_policies)
+              : null
+            )
+            expression = (
+              can(r.condition.expression)
+              ? templatestring(r.condition.expression, var.factories_config.context.org_policies)
+              : null
+            )
+            location = (
+              can(r.condition.location)
+              ? templatestring(r.condition.location, var.factories_config.context.org_policies)
+              : null
+            )
+            title = (
+              can(r.condition.title)
+              ? templatestring(r.condition.title, var.factories_config.context.org_policies)
+              : null
+            )
           }
-          parameters = try(r.parameters, null)
+          parameters = (
+            can(r.parameters)
+            ? templatestring(r.parameters, var.factories_config.context.org_policies)
+            : null
+          )
         }
       ]
     }

modules/project/variables.tf

@@ -87,6 +87,7 @@ variable "factories_config" {
     quotas        = optional(string)
     context = optional(object({
       notification_channels = optional(map(string), {})
+      org_policies          = optional(map(map(string)), {})
     }), {})
   })
   nullable = false