update

Author: xfz11

src/azure-cli/azure/cli/command_modules/serviceconnector/_params.py

@@ -191,11 +191,12 @@ def add_connstr_props_argument(context):
                      validator=validate_connstr_props)
 
 
-def add_force_create_arguments(context):
-    context.argument('force', options_list=['--force', '-f'],
+def add_no_recreate_arguments(context):
+    context.argument('no_recreate', options_list=['--no-recreate'],
                      arg_type=get_three_state_flag(), default=False,
-                     help='Indicates whether to force to execute operation to create \
-                           an existing connection even without any updates.')
+                     help='Indicates whether to skip execute creation operation \
+                           when no updates to an existing connection exists')
+
 
 def add_target_type_argument(context, source):
     TARGET_TYPES = [
@@ -327,7 +328,7 @@ def load_arguments(self, _):  # pylint: disable=too-many-statements
                 add_customized_keys_argument(c)
                 add_opt_out_argument(c)
                 add_connstr_props_argument(c)
-                add_force_create_arguments(c)
+                add_no_recreate_arguments(c)
 
             with self.argument_context('{} connection update {}'.format(source.value, target.value)) as c:
                 add_client_type_argument(c, source, target)

src/azure-cli/azure/cli/command_modules/serviceconnector/_utils.py

@@ -14,8 +14,6 @@
 )
 # from azure.cli.core._profile import Profile
 from ._resource_config import (
-    SOURCE_RESOURCES_USERTOKEN,
-    TARGET_RESOURCES_USERTOKEN,
     RESOURCE
 )
 from azure.cli.core import get_default_cli
@@ -126,8 +124,9 @@ def set_user_token_header(client, cli_ctx):
 
 def set_user_token_by_source_and_target(client, cli_ctx, source, target):
     '''Set user token header to work around OBO according to source and target'''
-    if source in SOURCE_RESOURCES_USERTOKEN or target in TARGET_RESOURCES_USERTOKEN:
-        return set_user_token_header(client, cli_ctx)
+    # deprecated
+    # if source in SOURCE_RESOURCES_USERTOKEN or target in TARGET_RESOURCES_USERTOKEN:
+    #     return set_user_token_header(client, cli_ctx)
     return client
 
 
@@ -582,44 +581,33 @@ def compare_properties_changed(new_props, existing_props):
     Returns True if there are differences that require an update.
     """
     def has_meaningful_changes(new_value, existing_value):
-        if new_value is None:
-            # If new value is None, no change needed
+        if new_value is None or new_value == "":
             return False
 
         if isinstance(new_value, dict) and isinstance(existing_value, dict):
-            # For nested dictionaries, check each key recursively
             for key, value in new_value.items():
+                if key == "mysql-identity-id" or key == 'user_object_id':
+                    continue
                 existing_props_key = key
                 if '_' in key:
                     existing_props_key = to_camel_case(key)
                 existing_nested = existing_value.get(existing_props_key) if existing_value else None
                 if has_meaningful_changes(value, existing_nested):
                     return True
             return False
-        elif isinstance(new_value, dict) and existing_value is None:
-            # If existing is None but new is a dict, check if any values in new dict are meaningful
+        if isinstance(new_value, dict) and existing_value is None:
             for value in new_value.values():
-                if value is not None:
+                if value is not None or value != "":
                     return True
             return False
-        else:
-            # For primitive values, compare directly
-            return new_value != existing_value
-
-    # Check if any property has meaningful changes
-    for key, new_value in new_props.items():
-        existing_props_key = key
-        if '_' in key:
-            existing_props_key = to_camel_case(key)
-        existing_value = existing_props.get(existing_props_key) if existing_props else None
-        if has_meaningful_changes(new_value, existing_value):
-            return True
-    return False
+
+        return new_value != existing_value
+
+    return has_meaningful_changes(new_props, existing_props)
 
 
 def to_camel_case(snake_str):
     if not snake_str or '_' not in snake_str:
         return snake_str
     components = snake_str.split('_')
     return components[0] + ''.join(word.capitalize() for word in components[1:])
-

src/azure-cli/azure/cli/command_modules/serviceconnector/custom.py

@@ -44,7 +44,7 @@
     get_secret_type_for_update
 )
 from ._credential_free import is_passwordless_command
-# pylint: disable=unused-argument,unsubscriptable-object,unsupported-membership-test,too-many-statements,too-many-locals
+# pylint: disable=unused-argument,unsubscriptable-object,unsupported-membership-test,too-many-statements,too-many-locals,broad-exception-caught
 
 
 logger = get_logger(__name__)
@@ -319,7 +319,7 @@ def connection_create(cmd, client,  # pylint: disable=too-many-locals,too-many-s
                       connstr_props=None,                                    # Resource.FabricSql
                       fabric_workspace_uuid=None,
                       fabric_sql_db_uuid=None,
-                      force=False,
+                      no_recreate=False,
                       ):
     auth_action = 'optOutAllAuth' if (opt_out_list is not None and
                                       OPT_OUT_OPTION.AUTHENTICATION.value in opt_out_list) else None
@@ -373,12 +373,12 @@ def connection_create(cmd, client,  # pylint: disable=too-many-locals,too-many-s
                                   enable_appconfig_extension=enable_appconfig_extension,
                                   server=server, database=database,
                                   connstr_props=connstr_props,
-                                  force=force,
+                                  no_recreate=no_recreate,
                                   )
 
 
 # The function is used in extension, new feature must be added in the end for backward compatibility
-def connection_create_func(cmd, client,  # pylint: disable=too-many-locals,too-many-statements
+def connection_create_func(cmd, client,  # pylint: disable=too-many-locals,too-many-statements,too-many-branches
                            connection_name=None, client_type=None,
                            source_resource_group=None, source_id=None,
                            target_resource_group=None, target_id=None,
@@ -409,7 +409,7 @@ def connection_create_func(cmd, client,  # pylint: disable=too-many-locals,too-m
                            target_app_name=None,                                  # Resource.ContainerApp
                            enable_appconfig_extension=False,
                            connstr_props=None,                                    # Resource.FabricSql
-                           force=False,
+                           no_recreate=False,
                            **kwargs,
                            ):
     if not source_id:
@@ -534,10 +534,19 @@ def connection_create_func(cmd, client,  # pylint: disable=too-many-locals,too-m
                                      'manually and then create the connection.'.format(str(e)))
 
     validate_service_state(parameters)
-    linker = todict(client.get(resource_uri=source_id, linker_name=connection_name))
-    if (linker is not None and not compare_properties_changed(parameters, linker) and force is False):
-        logger.warning('Connection exists and no property to be updated, skip the update operation. Use --force to force the connection recreation')
-        return linker
+    try:
+        linker = todict(client.get(resource_uri=source_id, linker_name=connection_name))
+        logger.warning('provisioningState of existing connection: %s', linker.get('provisioningState'))
+        if linker is not None and linker.get('provisioningState') == 'Accepted':
+            logger.warning('Connection provisioningState is Accepted, please retry later to avoid conflict.')
+            return linker
+        if linker is not None and linker.get('provisioningState') == 'Succeeded' and \
+                not compare_properties_changed(parameters, linker) and no_recreate is True:
+            logger.warning(
+                'Connection exists and no property to be updated, skip the update operation.')
+            return linker
+    except Exception as e:
+        logger.debug('No existing connection, start creating a new one. Error: %s', e)
 
     if enable_mi_for_db_linker and auth_action != 'optOutAllAuth':
         new_auth_info = enable_mi_for_db_linker(