Merge pull request Azure#112 from lil131/location-fix

fix hostname location parameter & add hostname tests with ASD

src/containerapp/azext_containerapp/_params.py

@@ -287,6 +287,7 @@ def load_arguments(self, _):
 
     with self.argument_context('containerapp hostname list') as c:
         c.argument('name', id_part=None)
+        c.argument('location', configured_default='location')
 
     with self.argument_context('containerapp hostname delete') as c:
         c.argument('hostname', help='The custom domain name.')

src/containerapp/azext_containerapp/_utils.py

@@ -1147,7 +1147,7 @@ def load_cert_file(file_path, cert_password=None):
             else:
                 raise FileOperationError('Not a valid file type. Only .PFX and .PEM files are supported.')
     except Exception as e:
-        raise CLIInternalError(e)
+        raise CLIInternalError(e) from e
     return blob, thumbprint
 
 
@@ -1193,8 +1193,10 @@ def patch_new_custom_domain(cmd, resource_group_name, name, new_custom_domains):
 def get_custom_domains(cmd, resource_group_name, name, location=None, environment=None):
     try:
         app = ContainerAppClient.show(cmd=cmd, resource_group_name=resource_group_name, name=name)
-        if location and (app["location"] != location):
-            raise ResourceNotFoundError('Container app {} is not in location {}.'.format(name, location))
+        if location:
+            _ensure_location_allowed(cmd, location, "Microsoft.App", "containerApps")
+            if _normalize_location(cmd, app["location"]) != _normalize_location(cmd, location):
+                raise ResourceNotFoundError('Container app {} is not in location {}.'.format(name, location))
         if environment and (_get_name(environment) != _get_name(app["properties"]["managedEnvironmentId"])):
             raise ResourceNotFoundError('Container app {} is not under environment {}.'.format(name, environment))
         if "ingress" in app["properties"]["configuration"] and "customDomains" in app["properties"]["configuration"]["ingress"]:

src/containerapp/azext_containerapp/custom.py

@@ -59,8 +59,8 @@
                      _ensure_identity_resource_id, _remove_dapr_readonly_attributes, _remove_env_vars, _validate_traffic_sum,
                      _update_revision_env_secretrefs, _get_acr_cred, safe_get, await_github_action, repo_url_to_name,
                      validate_container_app_name, _update_weights, get_vnet_location, register_provider_if_needed,
-                     generate_randomized_cert_name, _get_name, _update_weights, get_vnet_location, load_cert_file,
-                     check_cert_name_availability, validate_hostname, patch_new_custom_domain, get_custom_domains)
+                     generate_randomized_cert_name, _get_name, load_cert_file, check_cert_name_availability,
+                     validate_hostname, patch_new_custom_domain, get_custom_domains)
 
 from ._ssh_utils import (SSH_DEFAULT_ENCODING, WebSocketConnection, read_ssh, get_stdin_writer, SSH_CTRL_C_MSG,
                          SSH_BACKUP_ENCODING)

src/containerapp/azext_containerapp/tests/latest/domain-contact.json

@@ -0,0 +1,44 @@
+{
+    "address1": {
+        "value": "One Microsoft Way"
+    },
+    "address2": {
+        "value": ""
+    },
+    "city": {
+        "value": "Seattle"
+    },
+    "country": {
+        "value": "US"  
+    },
+    "postal_code": {
+        "value": "98109"
+    },
+    "state": {
+        "value": "WA"
+    },
+    "email": {
+        "value": "testemail@hotmail.com"
+    },
+    "fax": {
+        "value": ""
+    },
+    "job_title": {
+        "value": ""
+    },
+    "name_first": {
+        "value": "Jane"
+    },
+    "name_last": {
+        "value": "Doe"
+    },
+    "name_middle": {
+        "value": ""
+    },
+    "organization": {
+        "value": ""
+    },
+    "phone": {
+        "value": "+1.2061234567"
+    }
+}