Automation Toolkit Release v2024.2.2

Author: bhlohumi

cd3_automation_toolkit/Governance/Tagging/create_terraform_tags.py

@@ -216,23 +216,23 @@ def create_terraform_tags(inputfile, outdir, service_dir, prefix, ct):
                             if default_value != "" and str(default_value).lower() != "nan":
                                 if '$' in default_value and default_value.count('$') == 1:
                                     default_value = str(default_value).strip().replace('$','$$')
-                                #is_required = 'false' #Uncomment this line if needed
-                                columnvalue = key_tf_name+"="+default_compartment+"="+default_value#+"="+is_required #Uncomment this if needed
+                                is_required = 'false' #Uncomment this line if needed
+                                columnvalue = key_tf_name+"="+default_compartment+"="+default_value+"="+is_required #Uncomment this if needed
                                 if columnvalue not in default_tags:
                                     default_tags.append(columnvalue)
                             else:
                                 if default_value == '' or default_value.strip().lower() == 'nan':
                                     if str(df.loc[i,'Validator']).strip() != '' and  str(df.loc[i,'Validator']).strip().lower() != 'nan' and str(df.loc[i,'Validator']).strip() != []:
-                                        #is_required_updated = 'true' #Uncomment this if needed
+                                        is_required_updated = 'true' #Uncomment this if needed
                                         default_value = values_list[0]
-                                        columnvalue = key_tf_name+"="+default_compartment+"="+default_value#+"="+is_required_updated #Uncomment this if needed
+                                        columnvalue = key_tf_name+"="+default_compartment+"="+default_value+"="+is_required_updated #Uncomment this if needed
                                         if columnvalue not in default_tags:
                                             default_tags.append(columnvalue)
                                     else:
                                         if str(df.loc[i, 'Validator']).strip() == '' or  str(df.loc[i, 'Validator']).strip().lower() == 'nan':
-                                            #is_required_updated = 'true' #Uncomment this if needed
+                                            is_required_updated = 'true' #Uncomment this if needed
                                             default_value = '-'
-                                            columnvalue = key_tf_name+"="+default_compartment+"="+default_value#+"="+is_required_updated #Uncomment this if needed
+                                            columnvalue = key_tf_name+"="+default_compartment+"="+default_value+"="+is_required_updated #Uncomment this if needed
                                             if columnvalue not in default_tags:
                                                 default_tags.append(columnvalue)
 

cd3_automation_toolkit/Governance/Tagging/export_tags_nonGreenField.py

@@ -149,7 +149,10 @@ def export_tags_nongreenfield(inputfile, outdir, service_dir, config, signer, ct
             if tag_defaults.data != []:
                 for tag_default in tag_defaults.data:
                     if tag_default.tag_definition_name != '(deleted tag definition)':
-                        add_values_in_dict(tag_default_comps_map, tag_default.tag_definition_id+"="+tag_default.tag_definition_name, [ntk_compartment_name+"="+tag_default.value])
+                        my_val=tag_default.value
+                        if tag_default.is_required==True:
+                            my_val=""
+                        add_values_in_dict(tag_default_comps_map, tag_default.tag_definition_id+"="+tag_default.tag_definition_name, [ntk_compartment_name+"="+my_val])
                     defaultcomp_to_tagid_map.update({ commonTools.check_tf_variable(str(tag_default.tag_definition_name).replace('\\','\\\\'))+"-"+commonTools.check_tf_variable(ntk_compartment_name) : tag_default.id })
 
     comp_ocid_done = []

cd3_automation_toolkit/Governance/Tagging/templates/tags-defaults-template

@@ -22,7 +22,7 @@ tag_defaults = {
             compartment_id = "{{ tags.split('=')[1] }}"
             value = "{{ tags.split('=')[2] }}"
 
-            {# is_required =  {{ tags.split('=')[3] }} #} {# Uncomment this line if needed #}
+            is_required =  {{ tags.split('=')[3] }} #}
             },
     {% endfor %}