Automation Toolkit Release v2025.1.0

Author: xs2suruchi

cd3_automation_toolkit/Database/create_terraform_mysql_db.py

@@ -52,6 +52,10 @@ def create_terraform_mysql_db(inputfile, outdir, service_dir, prefix, ct):
     for i in df.index:
         region = str(df.loc[i, 'Region']).strip().lower()
 
+        if (region in commonTools.endNames):
+            break
+        region=region.strip().lower()
+
         # Skip if region is not in regions
         if region not in [x.lower() for x in ct.all_regions]:
             print(f"\nERROR!!! Invalid Region {str(df.loc[i, 'Region']).strip()} in MySQL DB System sheet. Skipping row!", file=sys.stderr)
@@ -68,7 +72,8 @@ def create_terraform_mysql_db(inputfile, outdir, service_dir, prefix, ct):
         # Initialize the template dictionary
         tempdict = {
             'display_tf_name': commonTools.check_tf_variable(str(df.loc[i, 'Display Name']).strip()),
-            'compartment_name': str(df.loc[i, 'Compartment Name']).strip(),
+            #'compartment_name': str(df.loc[i, 'Compartment Name']).strip(),
+            'compartment_name': commonTools.check_tf_variable(str(df.loc[i, 'Compartment Name']).strip()),
             'display_name': str(df.loc[i, 'Display Name']).strip(),
             'description': str(df.loc[i, 'Description']).strip(),
             'hostname_label': str(df.loc[i, 'Hostname Label']).strip(),
@@ -102,23 +107,39 @@ def create_terraform_mysql_db(inputfile, outdir, service_dir, prefix, ct):
                 # Split into compartment and name
                 config_parts = config_id.split('@')
                 if len(config_parts) == 2:
-                    config_compartment_name = config_parts[0].strip()
+                    config_compartment_name = commonTools.check_tf_variable(config_parts[0].strip())
                     config_name = config_parts[1].strip()
 
                     # Set both the configuration_id and configuration_compartment_id
                     tempdict['configuration_compartment_id'] = config_compartment_name
                     tempdict['configuration_id'] = config_name
+                    # Add depends_on attribute to ensure MySQL configuration is created first
+                    tempdict['depends_on_mysql_configuration'] = True
                 else:
-                    print(f"\nWARNING: Invalid configuration_id format: {config_id}. Expected format: compartment@name", file=sys.stderr)
+                    print(f"\nWARNING: Invalid configuration_id format: {config_id}. Expected format: compartment@name",
+                          file=sys.stderr)
                     tempdict['configuration_id'] = config_id
-                    tempdict['configuration_compartment_id'] = tempdict['compartment_name']  # Use MySQL compartment as default
+                    tempdict['configuration_compartment_id'] = tempdict[
+                        'compartment_name']  # Use MySQL compartment as default
+                    tempdict['depends_on_mysql_configuration'] = False
             else:
-                # If it's not in compartment@name format, use it directly (assuming it's an OCID)
-                tempdict['configuration_id'] = config_id
-                tempdict['configuration_compartment_id'] = tempdict['compartment_name']  # Use MySQL compartment as default
+                # If it's not in compartment@name format, check if it's an OCID or just a name
+                if config_id.startswith('ocid1.'):
+                    # It's an OCID, no dependency needed
+                    tempdict['configuration_id'] = config_id
+                    tempdict['configuration_compartment_id'] = tempdict[
+                        'compartment_name']  # Use MySQL compartment as default
+                    tempdict['depends_on_mysql_configuration'] = False
+                else:
+                    # It's just a name, we need to add dependency
+                    tempdict['configuration_id'] = config_id
+                    tempdict['configuration_compartment_id'] = tempdict[
+                        'compartment_name']  # Use MySQL compartment as default
+                    tempdict['depends_on_mysql_configuration'] = True
         else:
             tempdict['configuration_id'] = ''
             tempdict['configuration_compartment_id'] = tempdict['compartment_name']  # Use MySQL compartment as default
+            tempdict['depends_on_mysql_configuration'] = False
 
         # Process Availability Domain
         ad = str(df.loc[i, 'Availability Domain(AD1|AD2|AD3)']).strip()
@@ -139,7 +160,7 @@ def create_terraform_mysql_db(inputfile, outdir, service_dir, prefix, ct):
         if subnet_name and subnet_name.lower() != 'nan':
             subnet_parts = subnet_name.split('@')
             if len(subnet_parts) == 2:
-                network_compartment = subnet_parts[0].strip()
+                network_compartment = commonTools.check_tf_variable(subnet_parts[0].strip())
                 vcn_subnet = subnet_parts[1].strip()
                 vcn_subnet_parts = vcn_subnet.split('::')
                 if len(vcn_subnet_parts) == 2:

cd3_automation_toolkit/Database/export_mysql_db_nonGreenField.py

@@ -41,7 +41,7 @@
     'zurich': 'eu-zurich-1'
 }
 
-def print_mysql(region, vnc_client, mysql_db, values_for_column, ntk_compartment_name, state, ct, row):
+def print_mysql(region, vnc_client, mysql_db, values_for_column, ntk_compartment_name, state, ct, mysql_aas_client):
     mysql_tf_name = commonTools.check_tf_variable(mysql_db.display_name)
     mysql_subnet_id = mysql_db.subnet_id
 
@@ -66,40 +66,24 @@ def print_mysql(region, vnc_client, mysql_db, values_for_column, ntk_compartment
     if hasattr(mysql_db, 'configuration_id') and mysql_db.configuration_id:
         config_id = mysql_db.configuration_id
         try:
-            # Create MySQL client with the same config as the parent client
-            config_copy = dict(vnc_client.base_client.config)
-            # Create a copy of the config and set the region from Excel row
-            config_copy = config_copy.copy()
-            excel_region = row['Region'].lower().strip()
-            config_copy['region'] = region_mapping.get(excel_region, excel_region)
+            config_obj = mysql_aas_client.get_configuration(mysql_db.configuration_id).data
+        except Exception as e2:
+            print(f"\nWarning2: Could not fetch configuration details for {mysql_db.display_name}: {str(e2)}")
+            config_obj = None
 
-            # Try with both client types
-            try:
-                mysql_client = oci.mysql.MysqlaasClient(config=config_copy, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY, signer=vnc_client.base_client.signer)
-                config_obj = mysql_client.get_configuration(mysql_db.configuration_id).data
-            except Exception as e1:
-                try:
-                    mysql_client = oci.mysql.MysqlaasClient(config=config_copy, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY, signer=vnc_client.base_client.signer)
-                    config_obj = mysql_client.get_configuration(mysql_db.configuration_id).data
-                except Exception as e2:
-                    print(f"\nWarning2: Could not fetch configuration details for {mysql_db.display_name}: {str(e2)}")
-                    config_obj = None
-            
-            if hasattr(config_obj, 'display_name'):
-                config_name = config_obj.display_name
+        if hasattr(config_obj, 'display_name'):
+            config_name = config_obj.display_name
 
-                # Get configuration compartment name
-                for comp_name, comp_id in ct.ntk_compartment_ids.items():
-                    if comp_id == config_obj.compartment_id:
-                        config_compartment_name = comp_name
-                        break
+            # Get configuration compartment name
+            for comp_name, comp_id in ct.ntk_compartment_ids.items():
+                if comp_id == config_obj.compartment_id:
+                    config_compartment_name = comp_name
+                    break
 
-                # Format configuration name similar to subnet_name
-                if config_compartment_name and config_name:
-                    config_id = config_compartment_name +'@' + config_name
+            # Format configuration name similar to subnet_name
+            if config_compartment_name and config_name:
+                config_id = config_compartment_name +'@' + config_name
 
-        except Exception as e:
-            print(f"\nWarning1: Could not fetch configuration details for {mysql_db.display_name}: {str(e)}")
 
     # Check if resource exists in terraform state
     tf_resource = f'module.mysql_db_system[\\"{mysql_tf_name}\\"].oci_mysql_mysql_db_system.db_system'
@@ -125,9 +109,6 @@ def print_mysql(region, vnc_client, mysql_db, values_for_column, ntk_compartment
                 values_for_column[col_header].append(config_name)
             else:
                 values_for_column[col_header].append("")
-        elif col_header == 'Hostname Label':
-            hostname = mysql_db.hostname_label if mysql_db.hostname_label else mysql_db.display_name.lower().replace("-", "")
-            values_for_column[col_header].append(hostname)
         elif col_header == 'Shape':
             values_for_column[col_header].append(mysql_db.shape_name)
         elif col_header == 'Network Details':
@@ -244,14 +225,14 @@ def export_mysql_db(inputfile, outdir, service_dir, config, signer, ct, export_c
 
         region = reg.capitalize()
         vnc_client = oci.core.VirtualNetworkClient(config=config, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY, signer=signer)
+        mysql_client = oci.mysql.DbSystemClient(config=config, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY, signer=signer)
+        mysql_aas_client = oci.mysql.MysqlaasClient(config=config, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY, signer=signer)
 
         for ntk_compartment_name in export_compartments:
-            mysql_dbs = oci.pagination.list_call_get_all_results(oci.mysql.DbSystemClient(config=config, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY, signer=signer).list_db_systems,
-                                                               compartment_id=ct.ntk_compartment_ids[ntk_compartment_name],
-                                                               lifecycle_state="ACTIVE")
+            mysql_dbs = oci.pagination.list_call_get_all_results(mysql_client.list_db_systems,compartment_id=ct.ntk_compartment_ids[ntk_compartment_name],lifecycle_state="ACTIVE")
             for mysql_db in mysql_dbs.data:
 
-                mysql_db = oci.mysql.DbSystemClient(config=config, retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY, signer=signer).get_db_system(mysql_db.id).data
+                mysql_db = mysql_client.get_db_system(mysql_db.id).data
                 # Tags filter
                 defined_tags = mysql_db.defined_tags
                 tags_list = []
@@ -268,7 +249,7 @@ def export_mysql_db(inputfile, outdir, service_dir, config, signer, ct, export_c
                 if check == False:
                     continue
 
-                print_mysql(region, vnc_client, mysql_db, values_for_column, ntk_compartment_name, state, ct, df.iloc[0])
+                print_mysql(region, vnc_client, mysql_db, values_for_column, ntk_compartment_name, state, ct, mysql_aas_client)
 
     commonTools.write_to_cd3(values_for_column, cd3file, sheetName)
     print("{0} MySQL Database Systems exported into CD3.\n".format(len(values_for_column["Region"])))

cd3_automation_toolkit/Database/templates/mysql-template

@@ -24,7 +24,18 @@ mysql_db_system = {
             mysql_db_system_availability_domain          = "{{ availability_domain }}"
             mysql_db_system_fault_domain                 = "{{ fault_domain }}"
             configuration_compartment_id = "{{ configuration_compartment_id }}"
+            {% if depends_on_mysql_configuration %}
+            # Skip data source lookup for configurations created in the same Terraform run
+            skip_datasource_lookup = true
+            # Use the configuration name directly
+            configuration_name = "{{ configuration_id }}"
+            # Set an empty configuration_id to force the module to use the name
+            configuration_id = ""
+            # Add explicit depends_on to ensure configuration is created first
+            depends_on = ["module.mysql_configurations[\"{{ configuration_id }}\"]"]
+            {% else %}
             configuration_id = "{{ configuration_id }}"
+            {% endif %}
             mysql_shape_name                   = "{{ shape }}"
             vcn_names                     = "{{ vcn_names }}"
             subnet_id                    = "{{ subnet_id }}"

cd3_automation_toolkit/Excel_Columns

@@ -11,7 +11,8 @@
     "Users" :
     {
         "Family Name" : "family_name",
-        "User Name" : "name"
+        "User Name" : "name",
+        "MFA Status" : "urn_ietf_params_scim_schemas_oracle_idcs_extension_mfa_user.mfa_status"
     },
     "Policies" :
     {

cd3_automation_toolkit/Network/BaseNetwork/export_network_nonGreenField.py

@@ -974,6 +974,7 @@ def export_major_objects(inputfile, outdir, service_dir, config, signer, ct, exp
                 igw_info = None
                 ngw_info = None
                 sgw_info = None
+                drg_info = None
                 drg_attachment_info = None
 
                 for drg_attachment_info in DRG_Attachments.data:

cd3_automation_toolkit/setUpOCI.py

@@ -1437,11 +1437,6 @@ def create_mysql(execute_all=False,prim_options=[]):
         Option('Add/Modify/Delete MySQL DB Systems', Database.create_terraform_mysql_db, 'Processing MySQL-DBSystems Tab'),
         Option('Add/Modify/Delete MySQL Configurations', Database.create_terraform_mysql_configuration, 'Processing MySQL-Configurations Tab'),
     ]
-    if prim_options:
-        options = match_options(options, prim_options)
-    else:
-        if not execute_all:
-            options = show_options(options, quit=True, menu=True, index=1)
     execute_options(options, inputfile, outdir, service_dir_mysql_dbsystem, prefix, ct)
     # Update modified path list
     update_path_list(regions_path=subscribed_regions, service_dirs=[service_dir_mysql_dbsystem])