Adding cmds & tests for Container app certs & domains

src/containerapp/azext_containerapp/_clients.py

@@ -415,6 +415,22 @@ def get_auth_token(cls, cmd, resource_group_name, name):
         r = send_raw_request(cmd.cli_ctx, "POST", request_url)
         return r.json()
 
+    @classmethod
+    def validate_domain(cls, cmd, resource_group_name, name, hostname):
+        management_hostname = cmd.cli_ctx.cloud.endpoints.resource_manager
+        sub_id = get_subscription_id(cmd.cli_ctx)
+        url_fmt = "{}/subscriptions/{}/resourceGroups/{}/providers/Microsoft.App/containerApps/{}/listCustomHostNameAnalysis?api-version={}&customHostname={}"
+        request_url = url_fmt.format(
+            management_hostname.strip('/'),
+            sub_id,
+            resource_group_name,
+            name,
+            STABLE_API_VERSION,
+            hostname)
+
+        r = send_raw_request(cmd.cli_ctx, "POST", request_url)
+        return r.json()
+
 
 class ManagedEnvironmentClient():
     @classmethod
@@ -584,6 +600,94 @@ def list_by_resource_group(cls, cmd, resource_group_name, formatter=lambda x: x)
 
         return env_list
 
+    @classmethod
+    def show_certificate(cls, cmd, resource_group_name, name, certificate_name):
+        management_hostname = cmd.cli_ctx.cloud.endpoints.resource_manager
+        api_version = STABLE_API_VERSION
+        sub_id = get_subscription_id(cmd.cli_ctx)
+        url_fmt = "{}/subscriptions/{}/resourceGroups/{}/providers/Microsoft.App/managedEnvironments/{}/certificates/{}?api-version={}"
+        request_url = url_fmt.format(
+            management_hostname.strip('/'),
+            sub_id,
+            resource_group_name,
+            name,
+            certificate_name,
+            api_version)
+
+        r = send_raw_request(cmd.cli_ctx, "GET", request_url, body=None)
+        return r.json()
+
+    @classmethod
+    def list_certificates(cls, cmd, resource_group_name, name, formatter=lambda x: x):
+        certs_list = []
+
+        management_hostname = cmd.cli_ctx.cloud.endpoints.resource_manager
+        api_version = STABLE_API_VERSION
+        sub_id = get_subscription_id(cmd.cli_ctx)
+        url_fmt = "{}/subscriptions/{}/resourceGroups/{}/providers/Microsoft.App/managedEnvironments/{}/certificates?api-version={}"
+        request_url = url_fmt.format(
+            management_hostname.strip('/'),
+            sub_id,
+            resource_group_name,
+            name,
+            api_version)
+
+        r = send_raw_request(cmd.cli_ctx, "GET", request_url, body=None)
+        j = r.json()
+        for cert in j["value"]:
+            formatted = formatter(cert)
+            certs_list.append(formatted)
+        return certs_list
+
+    @classmethod
+    def create_or_update_certificate(cls, cmd, resource_group_name, name, certificate_name, certificate):
+        management_hostname = cmd.cli_ctx.cloud.endpoints.resource_manager
+        api_version = STABLE_API_VERSION
+        sub_id = get_subscription_id(cmd.cli_ctx)
+        url_fmt = "{}/subscriptions/{}/resourceGroups/{}/providers/Microsoft.App/managedEnvironments/{}/certificates/{}?api-version={}"
+        request_url = url_fmt.format(
+            management_hostname.strip('/'),
+            sub_id,
+            resource_group_name,
+            name,
+            certificate_name,
+            api_version)
+
+        r = send_raw_request(cmd.cli_ctx, "PUT", request_url, body=json.dumps(certificate))
+        return r.json()
+
+    @classmethod
+    def delete_certificate(cls, cmd, resource_group_name, name, certificate_name):
+        management_hostname = cmd.cli_ctx.cloud.endpoints.resource_manager
+        api_version = STABLE_API_VERSION
+        sub_id = get_subscription_id(cmd.cli_ctx)
+        url_fmt = "{}/subscriptions/{}/resourceGroups/{}/providers/Microsoft.App/managedEnvironments/{}/certificates/{}?api-version={}"
+        request_url = url_fmt.format(
+            management_hostname.strip('/'),
+            sub_id,
+            resource_group_name,
+            name,
+            certificate_name,
+            api_version)
+
+        return send_raw_request(cmd.cli_ctx, "DELETE", request_url, body=None)
+
+    @classmethod
+    def check_name_availability(cls, cmd, resource_group_name, name, name_availability_request):
+        management_hostname = cmd.cli_ctx.cloud.endpoints.resource_manager
+        api_version = STABLE_API_VERSION
+        sub_id = get_subscription_id(cmd.cli_ctx)
+        url_fmt = "{}/subscriptions/{}/resourceGroups/{}/providers/Microsoft.App/managedEnvironments/{}/checkNameAvailability?api-version={}"
+        request_url = url_fmt.format(
+            management_hostname.strip('/'),
+            sub_id,
+            resource_group_name,
+            name,
+            api_version)
+
+        r = send_raw_request(cmd.cli_ctx, "POST", request_url, body=json.dumps(name_availability_request))
+        return r.json()
+
 
 class GitHubActionClient():
     @classmethod

src/containerapp/azext_containerapp/_constants.py

@@ -12,3 +12,5 @@
 LOG_ANALYTICS_RP = "Microsoft.OperationalInsights"
 
 MAX_ENV_PER_LOCATION = 2
+
+CHECK_CERTIFICATE_NAME_AVAILABILITY_TYPE = "Microsoft.App/managedEnvironments/certificates"

src/containerapp/azext_containerapp/_help.py

@@ -423,6 +423,38 @@
           az containerapp env storage remove -g MyResourceGroup --storage-name MyStorageName -n MyEnvironment
 """
 
+# Certificates Commands
+helps['containerapp env certificate'] = """
+    type: group
+    short-summary: Commands to manage certificates for the Container Apps environment.
+"""
+
+helps['containerapp env certificate list'] = """
+    type: command
+    short-summary: List certificates for an environment.
+    examples:
+    - name: List certificates for an environment.
+      text: |
+          az containerapp env certificate list -g MyResourceGroup --name MyEnvironment
+"""
+
+helps['containerapp env certificate upload'] = """
+    type: command
+    short-summary: Add or update a certificate.
+    examples:
+    - name: Add or update a certificate.
+      text: |
+          az containerapp env certificate upload -g MyResourceGroup --name MyEnvironment -file MyFilepath
+"""
+
+helps['containerapp env certificate delete'] = """
+    type: command
+    short-summary: Delete a certificate from the Container Apps environment.
+    examples:
+    - name: Delete a certificate from the Container Apps environment.
+      text: |
+          az containerapp env certificate delete -g MyResourceGroup --name MyEnvironment --certificate-name MyCertificate
+"""
 
 # Identity Commands
 helps['containerapp identity'] = """
@@ -714,3 +746,32 @@
       text: |
           az containerapp dapr disable -n MyContainerapp -g MyResourceGroup
 """
+
+# custom domain Commands
+helps['containerapp ssl upload'] = """
+    type: command
+    short-summary: Upload certificate to a managed environment, add hostname to an app in that environment, and bind the certificate to the hostname
+"""
+
+helps['containerapp hostname'] = """
+    type: group
+    short-summary: Commands to manage hostnames of a container app.
+"""
+
+helps['containerapp hostname delete'] = """
+    type: command
+    short-summary: Delete hostnames from a container app.
+    examples:
+    - name: Delete secrets from a container app.
+      text: |
+          az containerapp hostname delete -n MyContainerapp -g MyResourceGroup --hostname MyHostname
+"""
+
+helps['containerapp hostname list'] = """
+    type: command
+    short-summary: List the hostnames of a container app.
+    examples:
+    - name: List the hostnames of a container app.
+      text: |
+          az containerapp hostname list -n MyContainerapp -g MyResourceGroup
+"""

src/containerapp/azext_containerapp/_models.py

@@ -181,6 +181,14 @@
     "tags": None
 }
 
+ContainerAppCertificate = {
+    "location": None,
+    "properties": {
+        "password": None,
+        "value": None
+    }
+}
+
 DaprComponent = {
     "properties": {
         "componentType": None,  # String
@@ -232,6 +240,22 @@
     "subscriptionId": None  # str
 }
 
+ContainerAppCustomDomainEnvelope = {
+    "properties": {
+        "configuration": {
+            "ingress": {
+                "customDomains": None
+            }
+        }
+    }
+}
+
+ContainerAppCustomDomain = {
+    "name": None,
+    "bindingType": "SniEnabled",
+    "certificateId": None
+}
+
 AzureFileProperties = {
     "accountName": None,
     "accountKey": None,

src/containerapp/azext_containerapp/_params.py

@@ -149,6 +149,19 @@ def load_arguments(self, _):
     with self.argument_context('containerapp env show') as c:
         c.argument('name', name_type, help='Name of the Container Apps Environment.')
 
+    with self.argument_context('containerapp env certificate upload') as c:
+        c.argument('certificate_file', options_list=['--certificate-file', '-file'], help='The filepath of the .pfx or .pem file')
+        c.argument('certificate_name', options_list=['--certificate-name', '-cert'], help='Name of the certificate which should be unique within the Container Apps environment.')
+        c.argument('certificate_password', options_list=['--password', '-p'], help='The certificate file password')
+
+    with self.argument_context('containerapp env certificate list') as c:
+        c.argument('certificate_name', options_list=['--certificate-name', '-cert'], help='Name of the certificate which is unique within the Container Apps environment.')
+        c.argument('thumbprint', options_list=['--thumbprint', '-tp'], help='Thumbprint of the certificate.')
+
+    with self.argument_context('containerapp env certificate delete') as c:
+        c.argument('certificate_name', options_list=['--certificate-name', '-cert'], help='Name of the certificate which is unique within the Container Apps environment.')
+        c.argument('thumbprint', options_list=['--thumbprint', '-tp'], help='Thumbprint of the certificate.')
+
     with self.argument_context('containerapp env storage') as c:
         c.argument('name', id_part=None)
         c.argument('storage_name', help="Name of the storage.")
@@ -257,3 +270,19 @@ def load_arguments(self, _):
         c.argument('service_principal_client_id', help='The service principal client ID. Used by Github Actions to authenticate with Azure.', options_list=["--service-principal-client-id", "--sp-cid"])
         c.argument('service_principal_client_secret', help='The service principal client secret. Used by Github Actions to authenticate with Azure.', options_list=["--service-principal-client-secret", "--sp-sec"])
         c.argument('service_principal_tenant_id', help='The service principal tenant ID. Used by Github Actions to authenticate with Azure.', options_list=["--service-principal-tenant-id", "--sp-tid"])
+
+    with self.argument_context('containerapp ssl upload') as c:
+        c.argument('hostname', help='The custom domain name.')
+        c.argument('environment', options_list=['--environment', '-env'], help='Name or resource id of the Container App environment.')
+        c.argument('certificate_file', options_list=['--certificate-file', '-file'], help='The filepath of the .pfx or .pem file')
+        c.argument('certificate_password', options_list=['--password', '-p'], help='The certificate file password')
+        c.argument('certificate_name', options_list=['--certificate-name', '-cert'], help='Name of the certificate which should be unique within the Container Apps environment.')
+
+    with self.argument_context('containerapp hostname bind') as c:
+        c.argument('hostname', help='The custom domain name.')
+        c.argument('thumbprint', options_list=['--thumbprint', '-tp'], help='Thumbprint of the certificate.')
+        c.argument('certificate', options_list=['--certificate', '-cert'], help='Name or resource id of the certificate.')
+        c.argument('environment', options_list=['--environment', '-env'], help='Name or resource id of the Container App environment.')
+
+    with self.argument_context('containerapp hostname delete') as c:
+        c.argument('hostname', help='The custom domain name.')

src/containerapp/azext_containerapp/_utils.py

@@ -1011,6 +1011,15 @@ def get_randomized_name(prefix, name=None, initial="rg"):
     return default
 
 
+def get_randomized_cert_name(thumbprint, prefix, initial="rg"):
+    from random import randint
+    cert_name = "{}-{}-{}-{:04}".format(prefix[:14], initial[:14], thumbprint[:4].lower(), randint(0, 9999))
+    for c in cert_name:
+        if not (c.isalnum() or c == '-' or c == '.'):
+            cert_name.replace(c, '-')
+    return cert_name.lower()
+
+
 def _set_webapp_up_default_args(cmd, resource_group_name, location, name, registry_server):
     from azure.cli.core.util import ConfiguredDefaultSetter
     with ConfiguredDefaultSetter(cmd.cli_ctx.config, True):

src/containerapp/azext_containerapp/commands.py

@@ -73,6 +73,11 @@ def load_command_table(self, _):
         g.custom_command('set', 'create_or_update_dapr_component')
         g.custom_command('remove', 'remove_dapr_component')
 
+    with self.command_group('containerapp env certificate') as g:
+        g.custom_command('list', 'list_certificates')
+        g.custom_command('upload', 'upload_certificate')
+        g.custom_command('delete', 'delete_certificate', confirmation=True, exception_handler=ex_handler_factory())
+
     with self.command_group('containerapp env storage') as g:
         g.custom_show_command('show', 'show_storage')
         g.custom_command('list', 'list_storage')
@@ -126,3 +131,11 @@ def load_command_table(self, _):
     with self.command_group('containerapp dapr') as g:
         g.custom_command('enable', 'enable_dapr', exception_handler=ex_handler_factory())
         g.custom_command('disable', 'disable_dapr', exception_handler=ex_handler_factory())
+
+    with self.command_group('containerapp ssl') as g:
+        g.custom_command('upload', 'upload_ssl', exception_handler=ex_handler_factory())
+
+    with self.command_group('containerapp hostname') as g:
+        g.custom_command('bind', 'bind_hostname', exception_handler=ex_handler_factory())
+        g.custom_command('list', 'list_hostname', exception_handler=ex_handler_factory())
+        g.custom_command('delete', 'delete_hostname', confirmation=True, exception_handler=ex_handler_factory())