fix preview

src/containerapp-preview/azext_containerapp_preview/commands.py

@@ -14,9 +14,9 @@ def load_command_table(self, _):
     azext_commands = _get_azext_module(
         GA_CONTAINERAPP_EXTENSION_NAME, "azext_containerapp.commands")
 
-    with self.command_group('containerapp', is_preview=True) as g:
-        g.custom_show_command('show', 'show_containerapp', table_transformer=azext_commands.transform_containerapp_output)
-        g.custom_command('list', 'list_containerapp', table_transformer=azext_commands.transform_containerapp_list_output)
-        g.custom_command('create', 'create_containerapp', supports_no_wait=True, exception_handler=ex_handler_factory(), table_transformer=azext_commands.transform_containerapp_output)
+    with self.command_group('containerapp') as g:
+        g.custom_show_command('show', 'show_containerapp', table_transformer=azext_commands.transform_containerapp_output, is_preview=True)
+        g.custom_command('list', 'list_containerapp', table_transformer=azext_commands.transform_containerapp_list_output, is_preview=True)
+        g.custom_command('create', 'create_containerapp', supports_no_wait=True, exception_handler=ex_handler_factory(), table_transformer=azext_commands.transform_containerapp_output, is_preview=True)
         # g.custom_command('update', 'update_containerapp', supports_no_wait=True, exception_handler=ex_handler_factory(), table_transformer=azext_commands.transform_containerapp_output)
-        g.custom_command('create', 'create_containerapp', supports_no_wait=True, exception_handler=ex_handler_factory(), table_transformer=azext_commands.transform_containerapp_output)
+        g.custom_command('create', 'create_containerapp', supports_no_wait=True, exception_handler=ex_handler_factory(), table_transformer=azext_commands.transform_containerapp_output, is_preview=True)

src/containerapp-preview/azext_containerapp_preview/containerapp_decorator.py

@@ -5,12 +5,24 @@
 from azure.cli.core.azclierror import ValidationError, RequiredArgumentMissingError
 from msrestazure.tools import parse_resource_id
 
-from ._clients import ManagedEnvironmentClient, ConnectedEnvironmentClient
+from ._clients import ManagedEnvironmentClient, ConnectedEnvironmentClient, ContainerAppClient
 from ._utils import (_get_azext_module, GA_CONTAINERAPP_EXTENSION_NAME)
 
 logger = get_logger(__name__)
 
 
+def get_containerapp_base_decorator(cmd, raw_parameters):
+    azext_decorator = _get_azext_module(GA_CONTAINERAPP_EXTENSION_NAME, "azext_containerapp.containerapp_decorator")
+
+    containerapp_base_decorator = azext_decorator.BaseContainerAppDecorator(
+        cmd=cmd,
+        client=ContainerAppClient,
+        raw_parameters=raw_parameters,
+        models="azext_containerapp._sdk_models"
+    )
+    return containerapp_base_decorator
+
+
 class ContainerAppPreviewCreateDecorator(_get_azext_module(GA_CONTAINERAPP_EXTENSION_NAME, "azext_containerapp.containerapp_decorator").ContainerAppCreateDecorator):
     def __init__(
         self, cmd: AzCliCommand, client: Any, raw_parameters: Dict, models: str
@@ -47,8 +59,7 @@ def get_environment_client(self):
         if self.get_argument_yaml():
             yaml_containerapp = self.get_yaml_containerapp()
             if type(yaml_containerapp) != dict:  # pylint: disable=unidiomatic-typecheck
-                raise ValidationError(
-                    'Invalid YAML provided. Please see https://aka.ms/azure-container-apps-yaml for a valid containerapps YAML spec.')
+                raise ValidationError('Invalid YAML provided. Please see https://aka.ms/azure-container-apps-yaml for a valid containerapps YAML spec.')
             env = self.azext_default_utils.safe_get(yaml_containerapp, "properties", "environmentId")
             if not env:
                 raise RequiredArgumentMissingError(
@@ -63,15 +74,13 @@ def get_environment_client(self):
         parsed_env = parse_resource_id(env)
 
         # Validate environment type
-        if parsed_env['resource_type'] == "connectedEnvironments":
+        if parsed_env.get('resource_type') == "connectedEnvironments":
             if environment_type == "managed":
-                logger.warning(
-                    "User passed a connectedEnvironment resource id but did not specify --environment-type connected. Using environment type connected.")
+                logger.warning("User passed a connectedEnvironment resource id but did not specify --environment-type connected. Using environment type connected.")
                 environment_type = "connected"
         else:
             if environment_type == "connected":
-                logger.warning(
-                    "User passed a managedEnvironment resource id but specified --environment-type connected. Using environment type managed.")
+                logger.warning("User passed a managedEnvironment resource id but specified --environment-type connected. Using environment type managed.")
 
         self.set_argument_environment_type(environment_type)
         self.set_argument_managed_env(env)

src/containerapp-preview/azext_containerapp_preview/custom.py

@@ -5,52 +5,28 @@
 from knack.log import get_logger
 
 from ._clients import ContainerAppClient
-from .containerapp_decorator import ContainerAppPreviewCreateDecorator
-from ._utils import (_get_azext_module, GA_CONTAINERAPP_EXTENSION_NAME)
+from .containerapp_decorator import ContainerAppPreviewCreateDecorator, get_containerapp_base_decorator
 
 logger = get_logger(__name__)
 
 
 def show_containerapp(cmd, name, resource_group_name, show_secrets=False):
     raw_parameters = locals()
-    azext_decorator = _get_azext_module(GA_CONTAINERAPP_EXTENSION_NAME, "azext_containerapp.containerapp_decorator")
-
-    containerapp_base_decorator = azext_decorator.BaseContainerAppDecorator(
-        cmd=cmd,
-        client=ContainerAppClient,
-        raw_parameters=raw_parameters,
-        models="azext_containerapp._sdk_models"
-    )
+    containerapp_base_decorator = get_containerapp_base_decorator(cmd, raw_parameters)
     containerapp_base_decorator.validate_subscription_registered()
-
     return containerapp_base_decorator.show_containerapp()
 
 
 def list_containerapp(cmd, resource_group_name=None, managed_env=None):
     raw_parameters = locals()
-    azext_decorator = _get_azext_module(GA_CONTAINERAPP_EXTENSION_NAME, "azext_containerapp.containerapp_decorator")
-
-    containerapp_base_decorator = azext_decorator.BaseContainerAppDecorator(
-        cmd=cmd,
-        client=ContainerAppClient,
-        raw_parameters=raw_parameters,
-        models="azext_containerapp._sdk_models"
-    )
+    containerapp_base_decorator = get_containerapp_base_decorator(cmd, raw_parameters)
     containerapp_base_decorator.validate_subscription_registered()
-
     return containerapp_base_decorator.list_containerapp()
 
 
 def delete_containerapp(cmd, name, resource_group_name, no_wait=False):
     raw_parameters = locals()
-    azext_decorator = _get_azext_module(GA_CONTAINERAPP_EXTENSION_NAME, "azext_containerapp.containerapp_decorator")
-
-    containerapp_base_decorator = azext_decorator.BaseContainerAppDecorator(
-        cmd=cmd,
-        client=ContainerAppClient,
-        raw_parameters=raw_parameters,
-        models="azext_containerapp._sdk_models"
-    )
+    containerapp_base_decorator = get_containerapp_base_decorator(cmd, raw_parameters)
     containerapp_base_decorator.validate_subscription_registered()
     return containerapp_base_decorator.delete()