Connected registry create: if data-endpoint disable, enable it.

Author: rosanch

src/azure-cli/azure/cli/command_modules/acr/commands.py

@@ -431,18 +431,18 @@ def _helm_deprecate_message(self):
 
     with self.command_group('acr connected-registry', acr_connected_registry_util, is_preview=True) as g:
         g.command('create', 'acr_connected_registry_create')
+        g.command('update', 'acr_connected_registry_update')
         g.command('delete', 'acr_connected_registry_delete')
         g.show_command('show', 'acr_connected_registry_show')
         g.command('deactivate', 'acr_connected_registry_deactivate')
-        g.command('update', 'acr_connected_registry_update')
         g.command('get-settings', 'acr_connected_registry_get_settings')
-        g.command('permissions update', 'acr_connected_registry_permissions_update')
-        g.show_command('permissions show', 'acr_connected_registry_permissions_show',
-                       table_transformer=scope_map_output_format)
         g.command('list', 'acr_connected_registry_list',
                   table_transformer=connected_registry_list_output_format)
         g.command('list-client-tokens', 'acr_connected_registry_list_client_tokens',
                   table_transformer=token_output_format)
+        g.command('permissions update', 'acr_connected_registry_permissions_update')
+        g.show_command('permissions show', 'acr_connected_registry_permissions_show',
+                       table_transformer=scope_map_output_format)
 
     def _metadata_deprecate_message(self):
         msg = "This {} has been deprecated and will be removed in future release.".format(self.object_type)

src/azure-cli/azure/cli/command_modules/acr/connected_registry.py

@@ -12,6 +12,7 @@
 from azure.cli.core.commands import LongRunningOperation
 from azure.cli.core.commands.client_factory import get_subscription_id
 from azure.cli.core.util import user_confirmation
+from azure.core.exceptions import HttpResponseError
 from ._client_factory import cf_acr_tokens, cf_acr_scope_maps
 from ._utils import (
     build_token_id,
@@ -22,7 +23,7 @@
     parse_scope_map_actions,
     validate_managed_registry
 )
-
+from .custom import acr_update_custom
 
 class ConnectedRegistryModes(Enum):
     READONLY = 'readonly'
@@ -59,33 +60,33 @@ def acr_connected_registry_create(cmd,  # pylint: disable=too-many-locals, too-m
                                   sync_window=None,
                                   log_level=None,
                                   sync_audit_logs_enabled=False,
-                                  notifications=None):
+                                  notifications=None,
+                                  yes=False):
 
     if bool(sync_token_name) == bool(repositories):
         raise CLIError("argument error: either --sync-token or --repository must be provided, but not both.")
     # Check needed since the sync token gateway actions must be at least 5 characters long.
     if len(connected_registry_name) < 5:
         raise InvalidArgumentValueError("argument error: Connected registry name must be at least 5 characters long.")
-    if re.match(r'\w*[A-Z]\w*', connected_registry_name):
-        raise InvalidArgumentValueError("argument error: Connected registry name must use only lowercase.")
-    registry, resource_group_name = get_registry_by_name(cmd.cli_ctx, registry_name, resource_group_name)
-    subscription_id = get_subscription_id(cmd.cli_ctx)
 
+    subscription_id = get_subscription_id(cmd.cli_ctx)
+    registry, resource_group_name = get_registry_by_name(cmd.cli_ctx, registry_name, resource_group_name)
     if not registry.data_endpoint_enabled:
-        raise CLIError("Can't create the connected registry '{}' ".format(connected_registry_name) +
-                       "because the cloud registry '{}' data endpoint is disabled. ".format(registry_name) +
-                       "Enabling the data endpoint might affect your firewall rules.\nTo enable data endpoint run:" +
-                       "\n\taz acr update -n {} --data-endpoint-enabled true".format(registry_name))
+        user_confirmation("Dedicated data enpoints must be enabled to use connected-registry. Enabling might " +
+                          "impact your firewall rules. Are you sure you want to enable it for '{}' registry?".format(
+                              registry_name), yes)
+        acr_update_custom(cmd, registry, resource_group_name, data_endpoint_enabled=True)
 
-    from azure.core.exceptions import HttpResponseError as ErrorResponseException
-    parent = None
+    connected_registry_name = connected_registry_name.lower()
+    parent_name = parent_name.lower() if parent_name else None
     mode = mode.lower()
+    parent = None
     if parent_name:
         try:
             parent = acr_connected_registry_show(cmd, client, parent_name, registry_name, resource_group_name)
             connected_registry_list = list(client.list(resource_group_name, registry_name))
             family_tree, _ = _get_family_tree(connected_registry_list, None)
-        except ErrorResponseException as ex:
+        except HttpResponseError as ex:
             if ex.response.status_code == 404:
                 raise CLIError("The parent connected registry '{}' could not be found.".format(parent_name))
             raise CLIError(ex)