Automation Toolkit Release v2024.4.1

Author: xs2suruchi

cd3_automation_toolkit/Identity/Users/export_users_nonGreenField.py

@@ -38,19 +38,22 @@ def map_columns(col_header):
         column_map = {
             "Region": ct.home_region.capitalize(),
             "User Name": username,
-            "Family Name": family_name,
-            "First Name": given_name,
+            "Family Name": family_name if hasattr(user_info, 'name') else "",
+            "First Name": given_name if hasattr(user_info, 'name') else "",
             "Description": description,
-            "Display Name": display_name,
+            "Display Name": display_name if hasattr(user_info, 'display_name') else "",
             "User Email": email,
             "Recovery Email": recovery_email,
             "Domain Name": domain_key,
             "Defined Tags": str(user_defined_tags) if user_defined_tags else "",
             "Enable Capabilities": add_capabilities(user_info),
-            "Middle Name": user_info.name.middle_name,
-            "Prefix": user_info.name.honorific_prefix,
-            "Home Phone Number": next((phone.value for phone in user_info.phone_numbers if phone.type == "home"), None) if user_info.phone_numbers else None,
-            "Mobile Phone Number": next((phone.value for phone in user_info.phone_numbers if phone.type == "mobile"), None) if user_info.phone_numbers else None
+            "Middle Name": getattr(user_info.name, 'middle_name', "") if hasattr(user_info, 'name') else "",
+            "Prefix": getattr(user_info.name, 'honorific_prefix', "") if hasattr(user_info, 'name') else "",
+            "Home Phone Number": next((phone.value for phone in user_info.phone_numbers if phone.type == "home"), None)
+            if hasattr(user_info, 'phone_numbers') and user_info.phone_numbers else None,
+            "Mobile Phone Number": next((phone.value for phone in user_info.phone_numbers if phone.type == "mobile"),
+                                        None)
+            if hasattr(user_info, 'phone_numbers') and user_info.phone_numbers else None
         }
         return column_map.get(col_header, None)
 
@@ -107,7 +110,8 @@ def export_users(inputfile, outdir, service_dir, config, signer, ct,export_domai
     if ct.identity_domain_enabled:
         for domain_key, idcs_endpoint in export_domains.items():
             domain_name = domain_key.split("@")[1]
-            domain_client = oci.identity_domains.IdentityDomainsClient(config, idcs_endpoint)
+            domain_client = oci.identity_domains.IdentityDomainsClient(config=config, signer=signer,
+                                                                       service_endpoint=idcs_endpoint)
             users = domain_client.list_users()
             index = 0
             for user in users.data.resources:
@@ -164,14 +168,17 @@ def export_users(inputfile, outdir, service_dir, config, signer, ct,export_domai
                 username = user_info.name
                 description = user_info.description
                 email = user_info.email
+                user_defined_tags = []
                 tf_name = commonTools.check_tf_variable(username)
                 import_user_id = user_info.id
                 tf_resource = f'module.iam-users[\\"{str(tf_name)}\\"].oci_identity_user.user'
                 if tf_resource not in state["resources"]:
                     importCommands += f'\n{tf_or_tofu} import "{tf_resource}" "{import_user_id}"'
 
                 count_u += 1
-                append_user_info(values_for_column_users,sheetName_users, ct, user_info, username, "", description, email, "", [])
+                #append_user_info(values_for_column_users,sheetName_users, ct, user_info, username, "", description, email, "", [])
+                append_user_info(values_for_column_users, sheet_dict_users, ct, user_info, username, "", "", "", "",
+                    description, email, "", user_defined_tags)
 
             if user.capabilities:
                 tf_resource = f'module.iam-users[\\"{str(tf_name)}\\"].oci_identity_user_capabilities_management.user_capabilities_management[0]'

cd3_automation_toolkit/Identity/export_identity_nonGreenField.py

@@ -357,7 +357,8 @@ def process_group(grp_info, members_list,membership_id_list, domain_name, is_dyn
         if ct.identity_domain_enabled:
             for domain_key, idcs_endpoint in export_domains.items():
                 domain_name = domain_key.split("@")[1]
-                domain_client = oci.identity_domains.IdentityDomainsClient(config, idcs_endpoint)
+                domain_client = oci.identity_domains.IdentityDomainsClient(config=config, signer=signer,
+                                                                           service_endpoint=idcs_endpoint)
                 groups = domain_client.list_groups(attributes=['members'], attribute_sets=['all'])
                 dyngroups = domain_client.list_dynamic_resource_groups(attributes=['matching_rule'], attribute_sets=['all'])
 

cd3_automation_toolkit/Release-Notes

@@ -4,8 +4,16 @@ Sep 30th, 2024
 -------------------------------------
 1. Call CD3 Validator for services while invoking create workflow for that service.
 2. Multi Prefix Support using Jenkins. Toolkit can be setup for multiple prefixes by specifying different values in tenancyconfig.properties.
-3. OCI RM Stack enhancements - disable legacy IMDS endpoints, enable in transit encryption, enable bastion plugin, specify custom boot volume size.
-4. Bug fixes - skip cross tenancy RPC, KMS fix, identity domain users/groups terraform modules, fetch compatible image OCIDs during createTenancyConfig.py
+3. CD3 VM RM Stack enhancements -
+ a. disable legacy IMDS endpoints
+ b. enable in transit encryption
+ c. enable bastion plugin
+ d. specify custom boot volume size.
+4. Bug fixes/Enhancements -
+ a. Skip cross tenancy RPCs while exporting network components.
+ b. Support for cross region replication feature for default vault as well.
+ c. Identity domain users/groups terraform modules enhancement to support optional attributes.
+ d. Fetch compatible image OCIDs during createTenancyConfig.py
 
 -------------------------------------
 CD3 Automation Toolkit Tag v2024.4.0

cd3_automation_toolkit/user-scripts/terraform/modules/identity/identity-domain-group/main.tf

@@ -8,7 +8,7 @@
 locals {
   user_ids = {
     for user in data.oci_identity_domains_users.users.users :
-      user.user_name => user.id
+      user.user_name => user.id...
   }
 }
 
@@ -33,7 +33,7 @@ resource "oci_identity_domains_group" "group" {
     for_each = {for k in var.members: k=>k}
     content {
       type  = "User"
-      value = local.user_ids[members.value]
+      value = local.user_ids[members.value][0]
     }
   }
   urnietfparamsscimschemasoracleidcsextensionrequestable_group {