addressing the styles and removing the duplicate key

Author: mettursathish

src/migrate/azext_migrate/helpers/replication/get/_execute_get.py

@@ -172,7 +172,6 @@ def _format_protected_item(item):
         'lastSuccessfulUnplannedFailoverTime': properties.get('lastSuccessfulUnplannedFailoverTime', 'N/A'),
         'resynchronizationRequired': properties.get('resynchronizationRequired', False),
         'lastTestFailoverStatus': properties.get('lastTestFailoverStatus', 'N/A'),
-        'replicationExtensionName': properties.get('replicationExtensionName', 'N/A'),
         'customProperties': custom_properties,
     }
 

src/migrate/azext_migrate/helpers/replication/job/_format.py

@@ -34,25 +34,23 @@ def calculate_duration(start_time, end_time):
 
             if hours > 0:
                 return f"{hours}h {minutes}m {seconds}s"
-            elif minutes > 0:
+            if minutes > 0:
                 return f"{minutes}m {seconds}s"
-            else:
-                return f"{seconds}s"
-        else:
-            # Job still running
-            now = datetime.utcnow()
-            duration = now - start
-            total_seconds = int(duration.total_seconds())
-            minutes, seconds = divmod(total_seconds, 60)
-            hours, minutes = divmod(minutes, 60)
-
-            if hours > 0:
-                return f"{hours}h {minutes}m (in progress)"
-            elif minutes > 0:
-                return f"{minutes}m {seconds}s (in progress)"
-            else:
-                return f"{seconds}s (in progress)"
-    except Exception:
+            return f"{seconds}s"
+
+        # Job still running
+        now = datetime.utcnow()
+        duration = now - start
+        total_seconds = int(duration.total_seconds())
+        minutes, seconds = divmod(total_seconds, 60)
+        hours, minutes = divmod(minutes, 60)
+
+        if hours > 0:
+            return f"{hours}h {minutes}m (in progress)"
+        if minutes > 0:
+            return f"{minutes}m {seconds}s (in progress)"
+        return f"{seconds}s (in progress)"
+    except Exception:  # pylint: disable=broad-exception-caught
         return None
 
 

src/migrate/azext_migrate/helpers/replication/job/_retrieve.py

@@ -148,13 +148,13 @@ def list_all_jobs(cmd, subscription_id, resource_group_name,
         for job in jobs:
             try:
                 formatted_jobs.append(format_job_summary(job))
-            except Exception as format_error:
+            except Exception as format_error:  # pylint: disable=broad-exception-caught
                 logger.warning("Error formatting job: %s", str(format_error))
                 # Skip jobs that fail to format
                 continue
 
         return formatted_jobs
 
-    except Exception as e:
+    except Exception as e:  # pylint: disable=broad-exception-caught
         logger.error("Error listing jobs: %s", str(e))
         raise CLIError(f"Failed to list jobs: {str(e)}")

src/migrate/azext_migrate/helpers/replication/list/_execute_list.py

@@ -167,7 +167,7 @@ def list_protected_items(cmd, subscription_id, resource_group_name, vault_name):
             try:
                 formatted_item = _format_protected_item(item)
                 formatted_items.append(formatted_item)
-            except Exception as format_error:
+            except Exception as format_error:  # pylint: disable=broad-exception-caught
                 logger.warning("Error formatting protected item: %s", str(format_error))
                 # Skip items that fail to format
                 continue

src/migrate/azext_migrate/helpers/replication/new/_execute_new.py

@@ -5,17 +5,15 @@
 
 # pylint: disable=line-too-long
 # pylint: disable=possibly-used-before-assignment
+from knack.util import CLIError
+from knack.log import get_logger
 from azext_migrate.helpers._utils import (
     get_resource_by_id,
     create_or_update_resource,
     APIVersion,
-    ProvisioningState,
     SiteTypes,
     VMNicSelection
 )
-import re
-from knack.util import CLIError
-from knack.log import get_logger
 
 logger = get_logger(__name__)
 
@@ -61,17 +59,17 @@ def get_ARC_resource_bridge_info(cmd, target_fabric, migrate_project):
             custom_location = get_resource_by_id(
                 cmd, custom_location_id, "2021-08-15")
             custom_location_region = custom_location.get('location')
-            logger.info(f"Retrieved custom location region: {custom_location_region}")
-        except Exception as e:
+            logger.info("Retrieved custom location region: %s", custom_location_region)
+        except Exception:  # pylint: disable=broad-exception-caught
             logger.warning(
-                f"Could not retrieve custom location: {str(e)}. "
-                f"Falling back to migrate project location.")
+                "Could not retrieve custom location. "
+                "Falling back to migrate project location.")
 
     # Fall back to migrate project location if we couldn't get custom location region
     if not custom_location_region:
         custom_location_region = migrate_project.get('location', 'eastus')
         logger.warning(
-            f"Using migrate project location as fallback: {custom_location_region}")
+            "Using migrate project location as fallback: %s", custom_location_region)
 
     return custom_location_id, custom_location_region, target_cluster_id
 
@@ -109,16 +107,16 @@ def ensure_target_resource_group_exists(cmd, target_resource_group_id,
             cmd, rg_check_uri, "2021-04-01")
         if existing_rg:
             logger.info(
-                f"Target resource group '{target_rg_name}' already exists "
-                f"in subscription '{target_subscription_id}'")
+                "Target resource group '%s' already exists "
+                "in subscription '%s'", target_rg_name, target_subscription_id)
             return existing_rg
     except CLIError as e:
         error_str = str(e)
         if "ResourceGroupNotFound" in error_str or "404" in error_str:
             # Resource group doesn't exist, create it
             logger.info(
-                f"Target resource group '{target_rg_name}' not found. "
-                f"Creating in subscription '{target_subscription_id}'...")
+                "Target resource group '%s' not found. "
+                "Creating in subscription '%s'...", target_rg_name, target_subscription_id)
 
             rg_body = {
                 "location": custom_location_region,
@@ -128,18 +126,17 @@ def ensure_target_resource_group_exists(cmd, target_resource_group_id,
             }
 
             print(
-                f"Creating target resource group '{target_rg_name}' "
-                f"in region '{custom_location_region}'...")
+                "Creating target resource group '%s' "
+                "in region '%s'..." % (target_rg_name, custom_location_region))
 
             created_rg = create_or_update_resource(
                 cmd, rg_check_uri, "2021-04-01", rg_body)
 
-            print(
-                f"✓ Target resource group '{target_rg_name}' created successfully")
+            print("Target resource group '%s' created successfully." % target_rg_name)
             return created_rg
-        else:
-            # Some other error, re-raise
-            raise
+
+        # Re-raise if it's a different error
+        raise
 
 
 def construct_disk_and_nic_mapping(is_power_user_mode,
@@ -262,7 +259,8 @@ def _handle_configuration_validation(cmd,
             APIVersion.Microsoft_DataReplication.value)
         if existing_item:
             protection_state = existing_item.get('properties', {}).get('protectionState')
-            logger.warning(f"Found existing protected item: {existing_item.get('id', 'unknown')}, state: {protection_state}")
+            logger.warning("Found existing protected item: %s, state: %s",
+                          existing_item.get('id', 'unknown'), protection_state)
 
             # If in failed state, offer helpful guidance
             if protection_state in ['EnablingFailed', 'DisablingFailed', 'Failed']:
@@ -271,14 +269,13 @@ def _handle_configuration_validation(cmd,
                     f"Please delete it first using Azure Portal or contact Azure Support. "
                     f"Protected item ID: {protected_item_uri}"
                 )
-            else:
-                raise CLIError(
-                    f"A replication already exists for machine '{machine_name}' (state: {protection_state}). "
-                    "Remove it first before creating a new one.")
+            raise CLIError(
+                f"A replication already exists for machine '{machine_name}' (state: {protection_state}). "
+                "Remove it first before creating a new one.")
     except (CLIError, ValueError, KeyError, TypeError) as e:
         # Check if it's a 404 Not Found error - that's expected and fine
         error_str = str(e)
-        logger.info(f"Exception during protected item check: {error_str}")
+        logger.info("Exception during protected item check: %s", error_str)
         if ("ResourceNotFound" in error_str or "404" in error_str or
                 "Not Found" in error_str):
             existing_item = None

src/migrate/azext_migrate/helpers/replication/new/_process_inputs.py

@@ -5,7 +5,6 @@
 
 # pylint: disable=line-too-long
 # pylint: disable=possibly-used-before-assignment
-from azure.cli.core.commands.client_factory import get_subscription_id
 from azext_migrate.helpers._utils import (
     send_get_request,
     get_resource_by_id,

src/migrate/azext_migrate/helpers/replication/remove/_execute_delete.py

@@ -120,7 +120,7 @@ def get_job_details(cmd, subscription_id, resource_group_name,
 
         return job_details
 
-    except Exception as job_error:
+    except Exception as job_error:  # pylint: disable=broad-exception-caught
         logger.warning(
             "Could not retrieve job details: %s. "
             "Replication removal was initiated.",
@@ -181,8 +181,8 @@ def execute_removal(cmd, subscription_id, target_object_id,
             display_removal_success(
                 protected_item_name, job_name, resource_group_name)
             return job_details
-        else:
-            # Job details unavailable but we have the job name
+
+        # Job details unavailable but we have the job name
             display_removal_success(
                 protected_item_name, job_name, resource_group_name)
             return None