[ContainerApp] adding --kind filter for az containerapp list (#9536)

Author: khushishah513

src/containerapp/HISTORY.rst

@@ -6,6 +6,7 @@ upcoming
 ++++++
 * 'az containerapp function invocations': Update application insights query 
 * 'az containerapp function keys': Update minimum replica check 
+* 'az containerapp list': Add `--kind` parameter to filter container apps by kind 
 
 1.3.0b1
 ++++++

src/containerapp/azext_containerapp/_help.py

@@ -1112,6 +1112,9 @@
     - name: List container apps by environment type.
       text: |
           az containerapp list --environment-type connected
+    - name: List Azure Functions on Container Apps only.
+      text: |
+          az containerapp list --kind functionapp
 """
 
 # Connected Environment Commands

src/containerapp/azext_containerapp/_params.py

@@ -337,6 +337,9 @@ def load_arguments(self, _):
         c.argument('managed_env', validator=validate_env_name_or_id, options_list=['--environment'], help="Name or resource ID of the container app's environment.")
         c.argument('environment_type', arg_type=get_enum_type(["managed", "connected"]), help="Type of environment.", is_preview=True)
 
+    with self.argument_context('containerapp list') as c:
+        c.argument('kind', arg_type=get_enum_type(['functionapp', 'logicapp']), help="Filter by kind. Use 'functionapp' to list only Azure Functions on Container Apps.", is_preview=True)
+
     with self.argument_context('containerapp connected-env') as c:
         c.argument('name', name_type, help='Name of the Container Apps connected environment.')
         c.argument('resource_group_name', arg_type=resource_group_name_type)

src/containerapp/azext_containerapp/_transformers.py

@@ -300,3 +300,18 @@ def transform_function_keys_list(result):
             return table
 
     return []
+
+
+def transform_containerapp_list_output_with_kind(apps):
+    """Transform containerapp list output to include the 'kind' field."""
+    result = []
+    for app in apps:
+        props = ['name', 'location', 'resourceGroup', 'provisioningState']
+        item = {k: app[k] for k in app if k in props}
+        item['kind'] = app.get('kind', None)
+        try:
+            item['fqdn'] = app['properties']['configuration']['ingress']['fqdn']
+        except:  # pylint: disable=bare-except
+            item['fqdn'] = None
+        result.append(item)
+    return result

src/containerapp/azext_containerapp/commands.py

@@ -6,9 +6,10 @@
 # pylint: disable=line-too-long, too-many-statements, bare-except
 # from azure.cli.core.commands import CliCommandType
 # from azure.mgmt.core.tools import is_valid_resource_id, parse_resource_id
-from azure.cli.command_modules.containerapp._transformers import (transform_containerapp_output, transform_containerapp_list_output)
+from azure.cli.command_modules.containerapp._transformers import transform_containerapp_output
 from azext_containerapp._client_factory import ex_handler_factory
 from ._transformers import (transform_sensitive_values,
+                            transform_containerapp_list_output_with_kind,
                             transform_telemetry_data_dog_values,
                             transform_telemetry_app_insights_values,
                             transform_telemetry_otlp_values,
@@ -25,7 +26,7 @@
 def load_command_table(self, args):
     with self.command_group('containerapp') as g:
         g.custom_show_command('show', 'show_containerapp', table_transformer=transform_containerapp_output)
-        g.custom_command('list', 'list_containerapp', table_transformer=transform_containerapp_list_output)
+        g.custom_command('list', 'list_containerapp', table_transformer=transform_containerapp_list_output_with_kind)
         g.custom_command('create', 'create_containerapp', supports_no_wait=True, exception_handler=ex_handler_factory(), table_transformer=transform_containerapp_output, transform=transform_sensitive_values)
         g.custom_command('update', 'update_containerapp', supports_no_wait=True, exception_handler=ex_handler_factory(), table_transformer=transform_containerapp_output, transform=transform_sensitive_values)
         g.custom_command('delete', 'delete_containerapp', supports_no_wait=True, confirmation=True, exception_handler=ex_handler_factory())

src/containerapp/azext_containerapp/containerapp_decorator.py

@@ -1787,8 +1787,13 @@ def list(self):
             containerapps = [c for c in containerapps if CONNECTED_ENVIRONMENT_RESOURCE_TYPE in c["properties"]["environmentId"]]
         if self.get_argument_environment_type() == MANAGED_ENVIRONMENT_TYPE:
             containerapps = [c for c in containerapps if MANAGED_ENVIRONMENT_RESOURCE_TYPE in c["properties"]["environmentId"]]
+        if self.get_argument_kind():
+            containerapps = [c for c in containerapps if c.get("kind") == self.get_argument_kind()]
         return containerapps
 
+    def get_argument_kind(self):
+        return self.get_param("kind")
+
     def get_environment_client(self):
         env = self.get_argument_managed_env()
 

src/containerapp/azext_containerapp/custom.py

@@ -705,7 +705,7 @@ def show_containerapp(cmd, name, resource_group_name, show_secrets=False):
     return containerapp_base_decorator.show()
 
 
-def list_containerapp(cmd, resource_group_name=None, managed_env=None, environment_type="all"):
+def list_containerapp(cmd, resource_group_name=None, managed_env=None, environment_type="all", kind=None):
     raw_parameters = locals()
     containerapp_list_decorator = ContainerAppPreviewListDecorator(
         cmd=cmd,