Merge branch 'main' into release-0.1.7

Signed-off-by: Andre Correa <51237693+andrecorreaneto@users.noreply.github.com>

policies/enclosing_cmp_policy.tf

@@ -68,7 +68,6 @@ locals {
   enclosing_cmps_policies = {
     for k, values in local.cmp_name_to_cislz_tag_map : 
       (upper("${k}-enclosing-policy")) => {
-        #name             = length(regexall("^${local.policy_name_prefix}", values["name"])) > 0 ? "${values["name"]}${local.policy_name_suffix}" : "${local.policy_name_prefix}${values["name"]}${local.policy_name_suffix}"
         name             = length(regexall("^${local.policy_name_prefix}", values["name"])) > 0 ? (length(split(",",values["cmp-type"])) > 1 ? "${values["name"]}-enclosing${local.policy_name_suffix}" : "${values["name"]}${local.policy_name_suffix}") : (length(split(",",values["cmp-type"])) > 1 ? "${local.policy_name_prefix}${values["name"]}-enclosing${local.policy_name_suffix}" : "${local.policy_name_prefix}${values["name"]}${local.policy_name_suffix}")
         compartment_ocid = values.ocid
         description      = "CIS Landing Zone policy for enclosing compartment."

policies/root_cmp_policy.tf

@@ -186,4 +186,4 @@ locals {
       statements       = local.root_cmp_nonadmin_grants
     }
   } : {}
-}
+}

policies/security_cmp_policy.tf

@@ -90,11 +90,11 @@ locals {
     for k, values in local.cmp_name_to_cislz_tag_map : 
       (upper("${k}-security-policy")) => {
         name             = length(regexall("^${local.policy_name_prefix}", values["name"])) > 0 ? (length(split(",",values["cmp-type"])) > 1 ? "${values["name"]}-security${local.policy_name_suffix}" : "${values["name"]}${local.policy_name_suffix}") : (length(split(",",values["cmp-type"])) > 1 ? "${local.policy_name_prefix}${values["name"]}-security${local.policy_name_suffix}" : "${local.policy_name_prefix}${values["name"]}${local.policy_name_suffix}")
-        compartment_ocid : values.ocid
-        description      : "CIS Landing Zone policy for Security compartment."
-        defined_tags     : var.policies_configuration.defined_tags
-        freeform_tags    : var.policies_configuration.freeform_tags
-        statements       : concat(local.security_read_grants_on_security_cmp_map[k],local.security_admin_grants_on_security_cmp_map[k],
+        compartment_ocid = values.ocid
+        description      = "CIS Landing Zone policy for Security compartment."
+        defined_tags     = var.policies_configuration.defined_tags
+        freeform_tags    = var.policies_configuration.freeform_tags
+        statements       = concat(local.security_read_grants_on_security_cmp_map[k],local.security_admin_grants_on_security_cmp_map[k],
                                   local.common_grants_on_security_cmp_map[k],
                                   local.storage_admin_grants_on_security_cmp_map[k],local.database_kms_grants_on_security_cmp_map[k])
       }

release.txt

@@ -1 +1 @@
-0.1.7
+0.1.7