P1s

src/containerapp/azext_containerapp/custom.py

@@ -456,33 +456,34 @@ def create_containerapp(cmd,
         handle_raw_exception(e)
 
 
-def update_containerapp(cmd,
-                        name,
-                        resource_group_name,
-                        yaml=None,
-                        image=None,
-                        container_name=None,
-                        min_replicas=None,
-                        max_replicas=None,
-                        set_env_vars=None,
-                        remove_env_vars=None,
-                        replace_env_vars=None,
-                        remove_all_env_vars=False,
-                        cpu=None,
-                        memory=None,
-                        revision_suffix=None,
-                        startup_command=None,
-                        args=None,
-                        tags=None,
-                        no_wait=False):
+def update_containerapp_logic(cmd,
+                              name,
+                              resource_group_name,
+                              yaml=None,
+                              image=None,
+                              container_name=None,
+                              min_replicas=None,
+                              max_replicas=None,
+                              set_env_vars=None,
+                              remove_env_vars=None,
+                              replace_env_vars=None,
+                              remove_all_env_vars=False,
+                              cpu=None,
+                              memory=None,
+                              revision_suffix=None,
+                              startup_command=None,
+                              args=None,
+                              tags=None,
+                              no_wait=False,
+                              from_revision=None):
     _validate_subscription_registered(cmd, "Microsoft.App")
 
     if yaml:
         if image or min_replicas or max_replicas or\
            set_env_vars or remove_env_vars or replace_env_vars or remove_all_env_vars or cpu or memory or\
            startup_command or args or tags:
             logger.warning('Additional flags were passed along with --yaml. These flags will be ignored, and the configuration defined in the yaml will be used instead')
-        return update_containerapp_yaml(cmd=cmd, name=name, resource_group_name=resource_group_name, file_name=yaml, no_wait=no_wait)
+        return update_containerapp_yaml(cmd=cmd, name=name, resource_group_name=resource_group_name, file_name=yaml, no_wait=no_wait, from_revision=from_revision)
 
     containerapp_def = None
     try:
@@ -493,6 +494,16 @@ def update_containerapp(cmd,
     if not containerapp_def:
         raise ResourceNotFoundError("The containerapp '{}' does not exist".format(name))
 
+    if from_revision:
+        try:
+            r = ContainerAppClient.show_revision(cmd=cmd, resource_group_name=resource_group_name, container_app_name=name, name=from_revision)
+        except CLIError as e:
+            # Error handle the case where revision not found?
+            handle_raw_exception(e)
+
+        _update_revision_env_secretrefs(r["properties"]["template"]["containers"], name)
+        containerapp_def["properties"]["template"] = r["properties"]["template"]
+
     # Doing this while API has bug. If env var is an empty string, API doesn't return "value" even though the "value" should be an empty string
     if "properties" in containerapp_def and "template" in containerapp_def["properties"] and "containers" in containerapp_def["properties"]["template"]:
         for container in containerapp_def["properties"]["template"]["containers"]:
@@ -640,6 +651,48 @@ def update_containerapp(cmd,
         handle_raw_exception(e)
 
 
+def update_containerapp(cmd,
+                        name,
+                        resource_group_name,
+                        yaml=None,
+                        image=None,
+                        container_name=None,
+                        min_replicas=None,
+                        max_replicas=None,
+                        set_env_vars=None,
+                        remove_env_vars=None,
+                        replace_env_vars=None,
+                        remove_all_env_vars=False,
+                        cpu=None,
+                        memory=None,
+                        revision_suffix=None,
+                        startup_command=None,
+                        args=None,
+                        tags=None,
+                        no_wait=False):
+    _validate_subscription_registered(cmd, "Microsoft.App")
+
+    return update_containerapp_logic(cmd,
+                                     name,
+                                     resource_group_name,
+                                     yaml,
+                                     image,
+                                     container_name,
+                                     min_replicas,
+                                     max_replicas,
+                                     set_env_vars,
+                                     remove_env_vars,
+                                     replace_env_vars,
+                                     remove_all_env_vars,
+                                     cpu,
+                                     memory,
+                                     revision_suffix,
+                                     startup_command,
+                                     args,
+                                     tags,
+                                     no_wait)
+
+
 def show_containerapp(cmd, name, resource_group_name):
     _validate_subscription_registered(cmd, "Microsoft.App")
 
@@ -1222,177 +1275,26 @@ def copy_revision(cmd,
     if not name:
         name = _get_app_from_revision(from_revision)
 
-    if yaml:
-        if image or min_replicas or max_replicas or\
-            set_env_vars or replace_env_vars or remove_env_vars or \
-            remove_all_env_vars or cpu or memory or \
-                startup_command or args or tags:
-            logger.warning('Additional flags were passed along with --yaml. These flags will be ignored, and the configuration defined in the yaml will be used instead')
-        return update_containerapp_yaml(cmd=cmd, name=name, resource_group_name=resource_group_name, file_name=yaml, from_revision=from_revision, no_wait=no_wait)
-
-    containerapp_def = None
-    try:
-        containerapp_def = ContainerAppClient.show(cmd=cmd, resource_group_name=resource_group_name, name=name)
-    except:
-        pass
-
-    if not containerapp_def:
-        raise ResourceNotFoundError("The containerapp '{}' does not exist".format(name))
-
-    if from_revision:
-        try:
-            r = ContainerAppClient.show_revision(cmd=cmd, resource_group_name=resource_group_name, container_app_name=name, name=from_revision)
-        except CLIError as e:
-            # Error handle the case where revision not found?
-            handle_raw_exception(e)
-
-        _update_revision_env_secretrefs(r["properties"]["template"]["containers"], name)
-        containerapp_def["properties"]["template"] = r["properties"]["template"]
-
-    # Doing this while API has bug. If env var is an empty string, API doesn't return "value" even though the "value" should be an empty string
-    if "properties" in containerapp_def and "template" in containerapp_def["properties"] and "containers" in containerapp_def["properties"]["template"]:
-        for container in containerapp_def["properties"]["template"]["containers"]:
-            if "env" in container:
-                for e in container["env"]:
-                    if "value" not in e:
-                        e["value"] = ""
-
-    update_map = {}
-    update_map['scale'] = min_replicas or max_replicas
-    update_map['container'] = image or container_name or set_env_vars or replace_env_vars or remove_env_vars or remove_all_env_vars or cpu or memory or startup_command is not None or args is not None
-
-    if tags:
-        _add_or_update_tags(containerapp_def, tags)
-
-    if revision_suffix is not None:
-        containerapp_def["properties"]["template"]["revisionSuffix"] = revision_suffix
-
-    # Containers
-    if update_map["container"]:
-        if not container_name:
-            if len(containerapp_def["properties"]["template"]["containers"]) == 1:
-                container_name = containerapp_def["properties"]["template"]["containers"][0]["name"]
-            else:
-                raise ValidationError("Usage error: --image-name is required when adding or updating a container")
-
-        # Check if updating existing container
-        updating_existing_container = False
-        for c in containerapp_def["properties"]["template"]["containers"]:
-            if c["name"].lower() == container_name.lower():
-                updating_existing_container = True
-
-                if image is not None:
-                    c["image"] = image
-
-                if set_env_vars is not None:
-                    if "env" not in c or not c["env"]:
-                        c["env"] = []
-                    # env vars
-                    _add_or_update_env_vars(c["env"], parse_env_var_flags(set_env_vars), is_add=True)
-
-                if replace_env_vars is not None:
-                    if "env" not in c or not c["env"]:
-                        c["env"] = []
-                    # env vars
-                    _add_or_update_env_vars(c["env"], parse_env_var_flags(replace_env_vars))
-
-                if remove_env_vars is not None:
-                    if "env" not in c or not c["env"]:
-                        c["env"] = []
-                    # env vars
-                    _remove_env_vars(c["env"], remove_env_vars)
-
-                if remove_all_env_vars:
-                    c["env"] = []
-
-                if startup_command is not None:
-                    if isinstance(startup_command, list) and not startup_command:
-                        c["command"] = None
-                    else:
-                        c["command"] = startup_command
-                if args is not None:
-                    if isinstance(args, list) and not args:
-                        c["args"] = None
-                    else:
-                        c["args"] = args
-                if cpu is not None or memory is not None:
-                    if "resources" in c and c["resources"]:
-                        if cpu is not None:
-                            c["resources"]["cpu"] = cpu
-                        if memory is not None:
-                            c["resources"]["memory"] = memory
-                    else:
-                        c["resources"] = {
-                            "cpu": cpu,
-                            "memory": memory
-                        }
-
-        # If not updating existing container, add as new container
-        if not updating_existing_container:
-            if image is None:
-                raise ValidationError("Usage error: --image is required when adding a new container")
-
-            resources_def = None
-            if cpu is not None or memory is not None:
-                resources_def = ContainerResourcesModel
-                resources_def["cpu"] = cpu
-                resources_def["memory"] = memory
-
-            container_def = ContainerModel
-            container_def["name"] = container_name
-            container_def["image"] = image
-
-            if set_env_vars is not None:
-                # env vars
-                _add_or_update_env_vars(container_def["env"], parse_env_var_flags(set_env_vars), is_add=True)
-
-            if replace_env_vars is not None:
-                # env vars
-                _add_or_update_env_vars(container_def["env"], parse_env_var_flags(replace_env_vars))
-
-            if remove_env_vars is not None:
-                # env vars
-                _remove_env_vars(container_def["env"], remove_env_vars)
-
-            if remove_all_env_vars:
-                container_def["env"] = []
-
-            if startup_command is not None:
-                if isinstance(startup_command, list) and not startup_command:
-                    container_def["command"] = None
-                else:
-                    container_def["command"] = startup_command
-            if args is not None:
-                if isinstance(args, list) and not args:
-                    container_def["args"] = None
-                else:
-                    container_def["args"] = args
-            if resources_def is not None:
-                container_def["resources"] = resources_def
-
-            containerapp_def["properties"]["template"]["containers"].append(container_def)
-
-    # Scale
-    if update_map["scale"]:
-        if "scale" not in containerapp_def["properties"]["template"]:
-            containerapp_def["properties"]["template"]["scale"] = {}
-        if min_replicas is not None:
-            containerapp_def["properties"]["template"]["scale"]["minReplicas"] = min_replicas
-        if max_replicas is not None:
-            containerapp_def["properties"]["template"]["scale"]["maxReplicas"] = max_replicas
-
-    _get_existing_secrets(cmd, resource_group_name, name, containerapp_def)
-
-    try:
-        r = ContainerAppClient.create_or_update(
-            cmd=cmd, resource_group_name=resource_group_name, name=name, container_app_envelope=containerapp_def, no_wait=no_wait)
-
-        if "properties" in r and "provisioningState" in r["properties"] and r["properties"]["provisioningState"].lower() == "waiting" and not no_wait:
-            logger.warning('Containerapp update in progress. Please monitor the update using `az containerapp show -n {} -g {}`'.format(name, resource_group_name))
-
-        return r
-    except Exception as e:
-        handle_raw_exception(e)
+    return update_containerapp_logic(cmd,
+                                     name,
+                                     resource_group_name,
+                                     yaml,
+                                     image,
+                                     container_name,
+                                     min_replicas,
+                                     max_replicas,
+                                     set_env_vars,
+                                     remove_env_vars,
+                                     replace_env_vars,
+                                     remove_all_env_vars,
+                                     cpu,
+                                     memory,
+                                     revision_suffix,
+                                     startup_command,
+                                     args,
+                                     tags,
+                                     no_wait,
+                                     from_revision)
 
 
 def set_revision_mode(cmd, resource_group_name, name, mode, no_wait=False):
@@ -1437,7 +1339,7 @@ def show_ingress(cmd, name, resource_group_name):
         raise ValidationError("The containerapp '{}' does not have ingress enabled.".format(name)) from e
 
 
-def enable_ingress(cmd, name, resource_group_name, type, target_port, transport, allow_insecure=False, no_wait=False):  # pylint: disable=redefined-builtin
+def enable_ingress(cmd, name, resource_group_name, type, target_port, transport="auto", allow_insecure=False, no_wait=False):  # pylint: disable=redefined-builtin
     _validate_subscription_registered(cmd, "Microsoft.App")
 
     containerapp_def = None
@@ -1715,22 +1617,28 @@ def remove_registry(cmd, name, resource_group_name, server, no_wait=False):
         pass
 
 
-def list_secrets(cmd, name, resource_group_name):
+def list_secrets(cmd, name, resource_group_name, show_values=False):
     _validate_subscription_registered(cmd, "Microsoft.App")
 
     containerapp_def = None
     try:
-        containerapp_def = ContainerAppClient.show(cmd=cmd, resource_group_name=resource_group_name, name=name)
+        r = containerapp_def = ContainerAppClient.show(cmd=cmd, resource_group_name=resource_group_name, name=name)
     except:
         pass
 
     if not containerapp_def:
         raise ResourceNotFoundError("The containerapp '{}' does not exist".format(name))
 
+    if not show_values:
+        try:
+            return r["properties"]["configuration"]["secrets"]
+        except:
+            return []
     try:
         return ContainerAppClient.list_secrets(cmd=cmd, resource_group_name=resource_group_name, name=name)["value"]
-    except Exception as e:
-        raise ValidationError("The containerapp {} has no assigned secrets.".format(name)) from e
+    except Exception:
+        return []
+        # raise ValidationError("The containerapp {} has no assigned secrets.".format(name)) from e
 
 
 def show_secret(cmd, name, resource_group_name, secret_name):
@@ -1823,6 +1731,7 @@ def set_secrets(cmd, name, resource_group_name, secrets,
     try:
         r = ContainerAppClient.create_or_update(
             cmd=cmd, resource_group_name=resource_group_name, name=name, container_app_envelope=containerapp_def, no_wait=no_wait)
+        logger.warning("Containerapp must be restarted in order for secret changes to take effect.")
         return r["properties"]["configuration"]["secrets"]
     except Exception as e:
         handle_raw_exception(e)