add validation

Author: trisavo-msft

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

@@ -29,7 +29,8 @@
 
 ACR_AUDIENCE_RESOURCE_NAME = "containerregistry"
 
-# Regex pattern to validate that registry name is alphanumeric and between 5 and 50 characters
+# Regex pattern to validate that registry name is alphanumeric and between 5 and 50 characters.
+# Dashes "-" are allowed to accomodate for domain name label scope, but is blocked on registry creation "acr create"
 ACR_NAME_VALIDATION_REGEX = r'^[a-zA-Z0-9-]{5,50}$'
 
 ALLOWED_TASK_FILE_TYPES = ('.yaml', '.yml', '.toml', '.json', '.sh', '.bash', '.zsh', '.ps1',

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

@@ -116,6 +116,12 @@ def validate_registry_name(cmd, namespace):
         if pos > 0:
             logger.warning("The login server endpoint suffix '%s' is automatically omitted.", acr_suffix)
             namespace.registry_name = registry[:pos]
+    # If registry contains - due to Domain Name Label Scope, such as "myregistry-dnlhash123.azurecr.io", strip "-dnlhash123"
+    dnl_hash = registry.find("-")
+    if registry and dnl_hash > 0:
+        logger.warning("The domain name label suffix '%s' is automatically omitted.", registry[dnl_hash:])
+        namespace.registry_name = registry[:dnl_hash]
+
     registry = namespace.registry_name
     if not re.match(ACR_NAME_VALIDATION_REGEX, registry):
         raise InvalidArgumentValueError(BAD_REGISTRY_NAME)

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

@@ -68,6 +68,9 @@ def acr_create(cmd,
 
     if re.match(r'\w*[A-Z]\w*', registry_name):
         raise InvalidArgumentValueError("argument error: Registry name must use only lowercase.")
+    
+    if re.match(r'\w*[-]\w*', registry_name):
+        raise InvalidArgumentValueError("argument error: Registry name cannot contain dashes.")
 
     Registry, Sku, NetworkRuleSet = cmd.get_models('Registry', 'Sku', 'NetworkRuleSet')
     registry = Registry(location=location, sku=Sku(name=sku), admin_user_enabled=admin_enabled,