az containerapp up: Fix InvalidResourceType error when cloud is not…

… AzureCloud (Azure#7551)

src/containerapp/HISTORY.rst

@@ -7,6 +7,7 @@ upcoming
 * 'az containerapp up/create/update': Wait longer time for logstream of Cloud Build to make sure the container start
 * 'az containerapp env java-component config-server-for-spring': Support create/update/show/delete Spring Cloud Config; deprecation of 'az containerapp env java-component spring-cloud-config'
 * 'az containerapp env java-component eureka-server-for-spring': Support create/update/show/delete Spring Cloud Eureka; deprecation of 'az containerapp env java-component spring-cloud-eureka'
+* 'az containerapp up': Fix InvalidResourceType error when cloud is not AzureCloud
 
 0.3.50
 ++++++

src/containerapp/azext_containerapp/_up_utils.py

@@ -60,7 +60,7 @@
     get_pack_exec_path, _validate_custom_loc_and_location, _validate_connected_k8s_exists, get_custom_location,
     create_extension, create_custom_location, get_cluster_extension, validate_environment_location,
     list_environment_locations, get_randomized_name_with_dash, get_randomized_name, get_connected_k8s,
-    list_cluster_extensions, list_custom_location
+    list_cluster_extensions, list_custom_location, is_cloud_supported_by_connected_env
 )
 
 from ._constants import (MAXIMUM_SECRET_LENGTH,
@@ -1381,9 +1381,10 @@ def _set_up_defaults(
                 "Please specify which resource group your Containerapp environment is in."
             )    # get ACR details from --image, if possible
 
-    _infer_existing_connected_env(cmd, location, resource_group, env, custom_location)
+    if is_cloud_supported_by_connected_env(cmd.cli_ctx):
+        _infer_existing_connected_env(cmd, location, resource_group, env, custom_location)
 
-    _infer_existing_custom_location_or_extension(cmd, name, location, resource_group, env, custom_location, extension)
+        _infer_existing_custom_location_or_extension(cmd, name, location, resource_group, env, custom_location, extension)
 
     if not is_registry_server_params_set:
         _get_acr_from_image(cmd, app)

src/containerapp/azext_containerapp/_utils.py

@@ -726,3 +726,11 @@ def parse_build_env_vars(env_list):
         })
 
     return env_var_def
+
+
+def is_cloud_supported_by_connected_env(cli_ctx):
+    from azure.cli.core.cloud import CloudNameEnum
+    if cli_ctx.cloud.name == CloudNameEnum.AzureCloud:
+        return True
+
+    return False

src/containerapp/azext_containerapp/commands.py

@@ -14,6 +14,7 @@
                             transform_telemetry_app_insights_values,
                             transform_telemetry_otlp_values,
                             transform_telemetry_otlp_values_by_name_wrapper)
+from ._utils import is_cloud_supported_by_connected_env
 
 
 def load_command_table(self, args):
@@ -151,32 +152,33 @@ def load_command_table(self, args):
         g.custom_command('apply', 'patch_apply')
         g.custom_command('interactive', 'patch_interactive')
 
-    with self.command_group('containerapp connected-env', is_preview=True) as g:
-        g.custom_show_command('show', 'show_connected_environment')
-        g.custom_command('list', 'list_connected_environments')
-        g.custom_command('create', 'create_connected_environment', supports_no_wait=True, exception_handler=ex_handler_factory())
-        g.custom_command('delete', 'delete_connected_environment', supports_no_wait=True, confirmation=True, exception_handler=ex_handler_factory())
-
-    with self.command_group('containerapp connected-env dapr-component', is_preview=True) as g:
-        g.custom_command('list', 'connected_env_list_dapr_components')
-        g.custom_show_command('show', 'connected_env_show_dapr_component')
-        g.custom_command('set', 'connected_env_create_or_update_dapr_component')
-        g.custom_command('remove', 'connected_env_remove_dapr_component')
-
-    with self.command_group('containerapp connected-env certificate', is_preview=True) as g:
-        g.custom_command('list', 'connected_env_list_certificates')
-        g.custom_command('upload', 'connected_env_upload_certificate')
-        g.custom_command('delete', 'connected_env_delete_certificate', confirmation=True, exception_handler=ex_handler_factory())
-
-    with self.command_group('containerapp connected-env storage', is_preview=True) as g:
-        g.custom_show_command('show', 'connected_env_show_storage')
-        g.custom_command('list', 'connected_env_list_storages')
-        g.custom_command('set', 'connected_env_create_or_update_storage', supports_no_wait=True, exception_handler=ex_handler_factory())
-        g.custom_command('remove', 'connected_env_remove_storage', supports_no_wait=True, confirmation=True, exception_handler=ex_handler_factory())
+    if is_cloud_supported_by_connected_env(self.cli_ctx):
+        with self.command_group('containerapp connected-env', is_preview=True) as g:
+            g.custom_show_command('show', 'show_connected_environment')
+            g.custom_command('list', 'list_connected_environments')
+            g.custom_command('create', 'create_connected_environment', supports_no_wait=True, exception_handler=ex_handler_factory())
+            g.custom_command('delete', 'delete_connected_environment', supports_no_wait=True, confirmation=True, exception_handler=ex_handler_factory())
+
+        with self.command_group('containerapp connected-env dapr-component', is_preview=True) as g:
+            g.custom_command('list', 'connected_env_list_dapr_components')
+            g.custom_show_command('show', 'connected_env_show_dapr_component')
+            g.custom_command('set', 'connected_env_create_or_update_dapr_component')
+            g.custom_command('remove', 'connected_env_remove_dapr_component')
+
+        with self.command_group('containerapp connected-env certificate', is_preview=True) as g:
+            g.custom_command('list', 'connected_env_list_certificates')
+            g.custom_command('upload', 'connected_env_upload_certificate')
+            g.custom_command('delete', 'connected_env_delete_certificate', confirmation=True, exception_handler=ex_handler_factory())
+
+        with self.command_group('containerapp connected-env storage', is_preview=True) as g:
+            g.custom_show_command('show', 'connected_env_show_storage')
+            g.custom_command('list', 'connected_env_list_storages')
+            g.custom_command('set', 'connected_env_create_or_update_storage', supports_no_wait=True, exception_handler=ex_handler_factory())
+            g.custom_command('remove', 'connected_env_remove_storage', supports_no_wait=True, confirmation=True, exception_handler=ex_handler_factory())
 
     with self.command_group('containerapp env java-component', is_preview=True) as g:
         g.custom_command('list', 'list_java_components')
-    
+
     with self.command_group('containerapp env java-component spring-cloud-config',
                                 deprecate_info=self.deprecate(redirect='containerapp env java-component config-server-for-spring', hide=True)) as g:
         g.custom_command('create', 'create_config_server_for_spring', supports_no_wait=True)