Added helps for params. Added error handling for non acr registry pas…

…sed with source. Ignore param disable_warnings for create and no_wait for up.

src/containerapp/azext_containerapp/_params.py

@@ -76,6 +76,7 @@ def load_arguments(self, _):
 
     with self.argument_context('containerapp create') as c:
         c.argument('traffic_weights', nargs='*', options_list=['--traffic-weight'], help="A list of revision weight(s) for the container app. Space-separated values in 'revision_name=weight' format. For latest revision, use 'latest=weight'")
+        c.ignore('disable_warnings')
 
     with self.argument_context('containerapp scale') as c:
         c.argument('min_replicas', type=int, help="The minimum number of replicas.")
@@ -180,6 +181,17 @@ def load_arguments(self, _):
     with self.argument_context('containerapp up') as c:
         c.argument('resource_group_name', configured_default='resource_group_name')
         c.argument('location', configured_default='location')
-        c.argument('name', configured_default='name')
+        c.argument('name', configured_default='name', id_part=None)
         c.argument('managed_env', configured_default='managed_env')
         c.argument('registry_server', configured_default='registry_server')
+        c.argument('disable_verbose', help="Disable verbose output from ACR build when using --source.")
+        c.argument('dockerfile', help="Name of the dockerfile.")
+        c.argument('dryrun', help="Show summary of the operation instead of executing it.")
+
+    with self.argument_context('containerapp up', arg_group='Log Analytics (Environment)') as c:
+        c.argument('logs_customer_id', type=str, options_list=['--logs-workspace-id'], help='Name or resource ID of the Log Analytics workspace to send diagnostics logs to. You can use \"az monitor log-analytics workspace create\" to create one. Extra billing may apply.')
+        c.argument('logs_key', type=str, options_list=['--logs-workspace-key'], help='Log Analytics workspace key to configure your Log Analytics workspace. You can use \"az monitor log-analytics workspace get-shared-keys\" to retrieve the key.')
+        c.ignore('no_wait')
+
+    with self.argument_context('containerapp', arg_group='Container') as c:
+        c.argument('source', type=str, help='Local directory path to upload to Azure container registry.')

src/containerapp/azext_containerapp/_utils.py

@@ -5,7 +5,7 @@
 # pylint: disable=line-too-long, consider-using-f-string, no-else-return, duplicate-string-formatting-argument
 
 from urllib.parse import urlparse
-from azure.cli.core.azclierror import (ValidationError, RequiredArgumentMissingError)
+from azure.cli.core.azclierror import (ValidationError, RequiredArgumentMissingError, CLIInternalError)
 from azure.cli.core.commands.client_factory import get_subscription_id
 from knack.log import get_logger
 from msrestazure.tools import parse_resource_id
@@ -131,7 +131,7 @@ def _update_revision_env_secretrefs(containers, name):
                     var["secretRef"] = var["secretRef"].replace("{}-".format(name), "")
 
 
-def store_as_secret_and_return_secret_ref(secrets_list, registry_user, registry_server, registry_pass, update_existing_secret=False):
+def store_as_secret_and_return_secret_ref(secrets_list, registry_user, registry_server, registry_pass, update_existing_secret=False, disable_warnings=False):
     if registry_pass.startswith("secretref:"):
         # If user passed in registry password using a secret
 
@@ -161,7 +161,8 @@ def store_as_secret_and_return_secret_ref(secrets_list, registry_user, registry_
                         raise ValidationError('Found secret with name \"{}\" but value does not equal the supplied registry password.'.format(registry_secret_name))
                 return registry_secret_name
 
-        # logger.warning('Adding registry password as a secret with name \"{}\"'.format(registry_secret_name))  # pylint: disable=logging-format-interpolation
+        if not disable_warnings:
+            logger.warning('Adding registry password as a secret with name \"{}\"'.format(registry_secret_name))  # pylint: disable=logging-format-interpolation
         secrets_list.append({
             "name": registry_secret_name,
             "value": registry_pass
@@ -233,7 +234,7 @@ def _generate_log_analytics_workspace_name(resource_group_name):
 
 def _generate_log_analytics_if_not_provided(cmd, logs_customer_id, logs_key, location, resource_group_name):
     if logs_customer_id is None and logs_key is None:
-        # logger.warning("No Log Analytics workspace provided.")
+        logger.warning("No Log Analytics workspace provided.")
         try:
             _validate_subscription_registered(cmd, "Microsoft.OperationalInsights")
             log_analytics_client = log_analytics_client_factory(cmd.cli_ctx)
@@ -250,7 +251,7 @@ def _generate_log_analytics_if_not_provided(cmd, logs_customer_id, logs_key, loc
 
             workspace_name = _generate_log_analytics_workspace_name(resource_group_name)
             workspace_instance = Workspace(location=log_analytics_location)
-            # logger.warning("Generating a Log Analytics workspace with name \"{}\"".format(workspace_name))  # pylint: disable=logging-format-interpolation
+            logger.warning("Generating a Log Analytics workspace with name \"{}\"".format(workspace_name))  # pylint: disable=logging-format-interpolation
 
             poller = log_analytics_client.begin_create_or_update(resource_group_name, workspace_name, workspace_instance)
             log_analytics_workspace = LongRunningOperation(cmd.cli_ctx)(poller)
@@ -288,7 +289,7 @@ def _generate_log_analytics_if_not_provided(cmd, logs_customer_id, logs_key, loc
 
         logs_key = shared_keys.primary_shared_key
 
-    return logs_customer_id, logs_key
+    return logs_customer_id, logs_key, workspace_name
 
 
 def _get_existing_secrets(cmd, resource_group_name, name, containerapp_def):
@@ -565,6 +566,7 @@ def _infer_acr_credentials(cmd, registry_server, disable_warnings=False):
     # If registry is Azure Container Registry, we can try inferring credentials
     if '.azurecr.io' not in registry_server:
         raise RequiredArgumentMissingError('Registry username and password are required if not using Azure Container Registry.')
+    logger.warning("Infer acr credentials")
     not disable_warnings and logger.warning('No credential was provided to access Azure Container Registry. Trying to look up credentials...')
     parsed = urlparse(registry_server)
     registry_name = (parsed.netloc if parsed.scheme else parsed.path).split('.')[0]
@@ -724,6 +726,8 @@ def queue_acr_build(cmd, registry_rg, registry_name, img_name, src_dir, dockerfi
         lro_poller = get_run_with_polling(cmd, client_runs, run_id, registry_name, registry_rg)
         acr = LongRunningOperation(cmd.cli_ctx)(lro_poller)
         logger.warning("Build {}.".format(acr.status.lower()))
+        if acr.status.lower() != "succeeded":
+            raise CLIInternalError("ACR build {}.".format(acr.status.lower()))
         return acr
 
     return stream_logs(cmd, client_runs, run_id, registry_name, registry_rg, None, False, True)

src/containerapp/azext_containerapp/custom.py

@@ -360,7 +360,7 @@ def create_containerapp(cmd,
 
         if secrets_def is None:
             secrets_def = []
-        registries_def["passwordSecretRef"] = store_as_secret_and_return_secret_ref(secrets_def, registry_user, registry_server, registry_pass)
+        registries_def["passwordSecretRef"] = store_as_secret_and_return_secret_ref(secrets_def, registry_user, registry_server, registry_pass, disable_warnings=disable_warnings)
 
     dapr_def = None
     if dapr_enabled:
@@ -1950,15 +1950,14 @@ def containerapp_up(cmd,
                     dockerfile="Dockerfile",
                     # compose=None,
                     ingress=None,
-                    port=None,
-                    registry_username=None,
-                    registry_password=None,
+                    target_port=None,
+                    registry_user=None,
+                    registry_pass=None,
                     env_vars=None,
                     dryrun=False,
                     logs_customer_id=None,
                     logs_key=None,
-                    disable_verbose=False,
-                    no_wait=False):
+                    disable_verbose=False):
     import os, json
     src_dir = os.getcwd()
     _src_path_escaped = "{}".format(src_dir.replace(os.sep, os.sep + os.sep))
@@ -2019,14 +2018,15 @@ def containerapp_up(cmd,
         if not resource_group_name:
             user = get_profile_username()
             rg_name = get_randomized_name(user, resource_group_name) if custom_rg_name is None else custom_rg_name
-            not dryrun and logger.warning("Creating new resource group {}".format(rg_name))
-            not dryrun and create_resource_group(cmd, rg_name, location)
+            if not dryrun:
+                logger.warning("Creating new resource group {}".format(rg_name))
+                create_resource_group(cmd, rg_name, location)
             resource_group_name = rg_name
         if not managed_env:
             env_name = "{}-env".format(name).replace("_","-")
             if not dryrun:
                 logger.warning("Creating new managed environment {}".format(env_name))
-                managed_env = create_managed_environment(cmd, env_name, location = location, resource_group_name=resource_group_name, logs_key=logs_key, logs_customer_id=logs_customer_id, disable_warnings=True, no_wait=no_wait)["id"]
+                managed_env = create_managed_environment(cmd, env_name, location = location, resource_group_name=resource_group_name, logs_key=logs_key, logs_customer_id=logs_customer_id, disable_warnings=True)["id"]
             else:
                 managed_env = env_name
     else:
@@ -2035,17 +2035,17 @@ def containerapp_up(cmd,
         env_name = containerapp_def["properties"]["managedEnvironmentId"].split('/')[8]
         if logs_customer_id and logs_key:
             if not dryrun:
-                managed_env = create_managed_environment(cmd, env_name, location = location, resource_group_name=resource_group_name, logs_key=logs_key, logs_customer_id=logs_customer_id, disable_warnings=True, no_wait=no_wait)["id"]
+                managed_env = create_managed_environment(cmd, env_name, location = location, resource_group_name=resource_group_name, logs_key=logs_key, logs_customer_id=logs_customer_id, disable_warnings=True)["id"]
 
     if image is not None and "azurecr.io" in image and not dryrun:
-        if registry_username is None or registry_password is None:
+        if registry_user is None or registry_pass is None:
             # If registry is Azure Container Registry, we can try inferring credentials
             logger.warning('No credential was provided to access Azure Container Registry. Trying to look up...')
             registry_server=image.split('/')[0]
             parsed = urlparse(image)
             registry_name = (parsed.netloc if parsed.scheme else parsed.path).split('.')[0]
         try:
-            registry_username, registry_password = _get_acr_cred(cmd.cli_ctx, registry_name)
+            registry_user, registry_pass = _get_acr_cred(cmd.cli_ctx, registry_name)
         except Exception as ex:
             raise RequiredArgumentMissingError('Failed to retrieve credentials for container registry. Please provide the registry username and password') from ex
 
@@ -2056,25 +2056,24 @@ def containerapp_up(cmd,
         registry_name = ""
         registry_rg = ""
         if registry_server:
-            if not dryrun and (registry_username is None or registry_password is None):
-                if "azurecr.io" in registry_server:
-                    # If registry is Azure Container Registry, we can try inferring credentials
-                    logger.warning('No credential was provided to access Azure Container Registry. Trying to look up...')
-                    parsed = urlparse(registry_server)
-                    registry_name = (parsed.netloc if parsed.scheme else parsed.path).split('.')[0]
-                    try:
-                        registry_username, registry_password, registry_rg = _get_acr_cred(cmd.cli_ctx, registry_name)
-                    except Exception as ex:
-                        raise RequiredArgumentMissingError('Failed to retrieve credentials for container registry. Please provide the registry username and password') from ex
-                else:
-                    raise RequiredArgumentMissingError("Registry usename and password are required if using non-Azure registry.")
+            if "azurecr.io" not in registry_server:
+                raise ValidationError("Cannot supply non-Azure registry when using --source.")
+            elif not dryrun and (registry_user is None or registry_pass is None):
+                # If registry is Azure Container Registry, we can try inferring credentials
+                logger.warning('No credential was provided to access Azure Container Registry. Trying to look up...')
+                parsed = urlparse(registry_server)
+                registry_name = (parsed.netloc if parsed.scheme else parsed.path).split('.')[0]
+                try:
+                    registry_user, registry_pass, registry_rg = _get_acr_cred(cmd.cli_ctx, registry_name)
+                except Exception as ex:
+                    raise RequiredArgumentMissingError('Failed to retrieve credentials for container registry. Please provide the registry username and password') from ex
         else:
             registry_rg = resource_group_name
             user = get_profile_username()
             registry_name = "{}acr".format(name)
             registry_name = registry_name + str(hash((registry_rg, user, name))).replace("-","")
-            not dryrun and logger.warning("Creating new acr {}".format(registry_name))
             if not dryrun:
+                logger.warning("Creating new acr {}".format(registry_name))
                 registry_def = create_new_acr(cmd, registry_name, registry_rg, location)
                 registry_server = registry_def.login_server
             else:
@@ -2085,7 +2084,8 @@ def containerapp_up(cmd,
         now = datetime.now()
         image_name += ":{}".format(str(now).replace(' ', '').replace('-','').replace('.','').replace(':',''))
         image = registry_server + '/' + image_name
-        not dryrun and queue_acr_build(cmd, registry_rg, registry_name, image_name, source, dockerfile, disable_verbose)
+        if not dryrun:
+            queue_acr_build(cmd, registry_rg, registry_name, image_name, source, dockerfile, disable_verbose)
         _set_webapp_up_default_args(cmd, resource_group_name, location, name, registry_server)
 
     dry_run_str = r""" {
@@ -2098,10 +2098,10 @@ def containerapp_up(cmd,
                 "src_path" : "%s"
                 }
                 """ % (name, resource_group_name, location, env_name, registry_server, image, _src_path_escaped)
-
-    not dryrun and create_containerapp(cmd=cmd, name=name, resource_group_name=resource_group_name, image=image, managed_env=managed_env, target_port=port, registry_server=registry_server, registry_pass=registry_password, registry_user=registry_username, env_vars=env_vars, ingress=ingress, disable_warnings=True, no_wait=no_wait)
-
     if dryrun:
         logger.warning("Containerapp will be created with the below configuration, re-run command "
                        "without the --dryrun flag to create & deploy a new containerapp.")
+    else:
+        create_containerapp(cmd=cmd, name=name, resource_group_name=resource_group_name, image=image, managed_env=managed_env, target_port=target_port, registry_server=registry_server, registry_pass=registry_pass, registry_user=registry_user, env_vars=env_vars, ingress=ingress, disable_warnings=True)
+
     return json.loads(dry_run_str)