[containerapp] az containerapp env create: Update the default value…

… of `--enable-workload-profiles` to `True` (#27680)
Azure · Nov 1, 2023 · e7cbc62 · e7cbc62
1 parent b569674
commit e7cbc62
Show file tree

Hide file tree

Showing 110 changed files with 192,651 additions and 207,399 deletions.
diff --git a/src/azure-cli/azure/cli/command_modules/containerapp/_clients.py b/src/azure-cli/azure/cli/command_modules/containerapp/_clients.py
@@ -17,7 +17,7 @@
 logger = get_logger(__name__)
 
 CURRENT_API_VERSION = "2023-05-01"
-POLLING_TIMEOUT = 600  # how many seconds before exiting
+POLLING_TIMEOUT = 1200  # how many seconds before exiting
 POLLING_SECONDS = 2  # how many seconds between requests
 POLLING_TIMEOUT_FOR_MANAGED_CERTIFICATE = 1500  # how many seconds before exiting
 POLLING_INTERVAL_FOR_MANAGED_CERTIFICATE = 4  # how many seconds between requests

diff --git a/src/azure-cli/azure/cli/command_modules/containerapp/_compose_utils.py b/src/azure-cli/azure/cli/command_modules/containerapp/_compose_utils.py
@@ -281,6 +281,8 @@ def validate_memory_and_cpu_setting(cpu, memory, managed_environment):
     # only v1 cluster do the validation
     from ._utils import safe_get
     if safe_get(managed_environment, "properties", "workloadProfiles"):
+        if memory:
+            return cpu, f"{memory}Gi"
         return cpu, memory
 
     settings = valid_resource_settings()

diff --git a/src/azure-cli/azure/cli/command_modules/containerapp/_params.py b/src/azure-cli/azure/cli/command_modules/containerapp/_params.py
@@ -175,7 +175,7 @@ def load_arguments(self, _):
 
     with self.argument_context('containerapp env create') as c:
         c.argument('zone_redundant', options_list=["--zone-redundant", "-z"], help="Enable zone redundancy on the environment. Cannot be used without --infrastructure-subnet-resource-id. If used with --location, the subnet's location must match")
-        c.argument('enable_workload_profiles', arg_type=get_three_state_flag(), options_list=["--enable-workload-profiles", "-w"], help="Boolean indicating if the environment is enabled to have workload profiles", default=False)
+        c.argument('enable_workload_profiles', arg_type=get_three_state_flag(), options_list=["--enable-workload-profiles", "-w"], help="Boolean indicating if the environment is enabled to have workload profiles")
 
     with self.argument_context('containerapp env update') as c:
         c.argument('name', name_type, help='Name of the Container Apps environment.')

diff --git a/src/azure-cli/azure/cli/command_modules/containerapp/containerapp_env_decorator.py b/src/azure-cli/azure/cli/command_modules/containerapp/containerapp_env_decorator.py
@@ -21,8 +21,8 @@
                      load_cert_file,
                      safe_set,
                      get_default_workload_profiles,
-                     _azure_monitor_quickstart)
-from ._client_factory import handle_raw_exception
+                     _azure_monitor_quickstart, safe_get)
+from ._client_factory import handle_raw_exception, handle_non_404_status_code_exception
 from .base_resource import BaseResource
 from ._models import (
     ManagedEnvironment as ManagedEnvironmentModel,
@@ -189,6 +189,23 @@ def construct_payload(self):
 
     def set_up_workload_profiles(self):
         if self.get_argument_enable_workload_profiles():
+            # If the environment exists, infer the environment type
+            existing_environment = None
+            try:
+                existing_environment = self.client.show(cmd=self.cmd,
+                                                        resource_group_name=self.get_argument_resource_group_name(),
+                                                        name=self.get_argument_name())
+            except Exception as e:
+                handle_non_404_status_code_exception(e)
+
+            if existing_environment and safe_get(existing_environment, "properties", "workloadProfiles") is None:
+                # check if input params include -w/--enable-workload-profiles
+                if self.cmd.cli_ctx.data.get('safe_params') and ('-w' in self.cmd.cli_ctx.data.get(
+                        'safe_params') or '--enable-workload-profiles' in self.cmd.cli_ctx.data.get('safe_params')):
+                    raise ValidationError(
+                        f"Existing environment {self.get_argument_name()} cannot enable workload profiles. If you want to use Consumption and Dedicated environment, please create a new one.")
+                return
+
             self.managed_env_def["properties"]["workloadProfiles"] = get_default_workload_profiles(self.cmd, self.get_argument_location())
 
     def set_up_app_log_configuration(self):

diff --git a/src/azure-cli/azure/cli/command_modules/containerapp/custom.py b/src/azure-cli/azure/cli/command_modules/containerapp/custom.py
@@ -819,7 +819,7 @@ def create_managed_environment(cmd,
                                hostname=None,
                                certificate_file=None,
                                certificate_password=None,
-                               enable_workload_profiles=False,
+                               enable_workload_profiles=True,
                                mtls_enabled=None,
                                no_wait=False):
     raw_parameters = locals()

diff --git a/...li/azure/cli/command_modules/containerapp/tests/latest/recordings/test_container_acr.yaml b/...li/azure/cli/command_modules/containerapp/tests/latest/recordings/test_container_acr.yaml
diff --git a/.../cli/command_modules/containerapp/tests/latest/recordings/test_container_acr_env_var.yaml b/.../cli/command_modules/containerapp/tests/latest/recordings/test_container_acr_env_var.yaml
diff --git a/..._modules/containerapp/tests/latest/recordings/test_container_app_mount_azurefile_e2e.yaml b/..._modules/containerapp/tests/latest/recordings/test_container_app_mount_azurefile_e2e.yaml
diff --git a/...and_modules/containerapp/tests/latest/recordings/test_container_app_mount_secret_e2e.yaml b/...and_modules/containerapp/tests/latest/recordings/test_container_app_mount_secret_e2e.yaml
diff --git a/...ules/containerapp/tests/latest/recordings/test_container_app_mount_secret_update_e2e.yaml b/...ules/containerapp/tests/latest/recordings/test_container_app_mount_secret_update_e2e.yaml
diff --git a/...nd_modules/containerapp/tests/latest/recordings/test_containerapp_anonymous_registry.yaml b/...nd_modules/containerapp/tests/latest/recordings/test_containerapp_anonymous_registry.yaml
diff --git a/.../cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_auth_e2e.yaml b/.../cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_auth_e2e.yaml
diff --git a/...and_modules/containerapp/tests/latest/recordings/test_containerapp_auth_facebook_e2e.yaml b/...and_modules/containerapp/tests/latest/recordings/test_containerapp_auth_facebook_e2e.yaml
diff --git a/...mmand_modules/containerapp/tests/latest/recordings/test_containerapp_auth_github_e2e.yaml b/...mmand_modules/containerapp/tests/latest/recordings/test_containerapp_auth_github_e2e.yaml
diff --git a/...dules/containerapp/tests/latest/recordings/test_containerapp_auth_openid_connect_e2e.yaml b/...dules/containerapp/tests/latest/recordings/test_containerapp_auth_openid_connect_e2e.yaml
diff --git a/...tests/latest/recordings/test_containerapp_compose_create_basic_no_existing_resources.yaml b/...tests/latest/recordings/test_containerapp_compose_create_basic_no_existing_resources.yaml
diff --git a/...ntainerapp/tests/latest/recordings/test_containerapp_compose_create_with_environment.yaml b/...ntainerapp/tests/latest/recordings/test_containerapp_compose_create_with_environment.yaml
diff --git a/...app/tests/latest/recordings/test_containerapp_compose_create_with_environment_prompt.yaml b/...app/tests/latest/recordings/test_containerapp_compose_create_with_environment_prompt.yaml
diff --git a/...tainerapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_both.yaml b/...tainerapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_both.yaml
diff --git a/...erapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_external.yaml b/...erapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_external.yaml
diff --git a/...erapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_internal.yaml b/...erapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_internal.yaml
diff --git a/...inerapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_prompt.yaml b/...inerapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_prompt.yaml
diff --git a/...rapp/tests/latest/recordings/test_containerapp_compose_create_with_registry_all_args.yaml b/...rapp/tests/latest/recordings/test_containerapp_compose_create_with_registry_all_args.yaml
diff --git a/...sts/latest/recordings/test_containerapp_compose_create_with_registry_server_arg_only.yaml b/...sts/latest/recordings/test_containerapp_compose_create_with_registry_server_arg_only.yaml
diff --git a/.../tests/latest/recordings/test_containerapp_compose_create_with_replicas_global_scale.yaml b/.../tests/latest/recordings/test_containerapp_compose_create_with_replicas_global_scale.yaml
diff --git a/...sts/latest/recordings/test_containerapp_compose_create_with_replicas_replicated_mode.yaml b/...sts/latest/recordings/test_containerapp_compose_create_with_replicas_replicated_mode.yaml
diff --git a/...rdings/test_containerapp_compose_create_with_resources_from_both_cpus_and_deploy_cpu.yaml b/...rdings/test_containerapp_compose_create_with_resources_from_both_cpus_and_deploy_cpu.yaml
diff --git a/...ts/latest/recordings/test_containerapp_compose_create_with_resources_from_deploy_cpu.yaml b/...ts/latest/recordings/test_containerapp_compose_create_with_resources_from_deploy_cpu.yaml
diff --git a/.../latest/recordings/test_containerapp_compose_create_with_resources_from_service_cpus.yaml b/.../latest/recordings/test_containerapp_compose_create_with_resources_from_service_cpus.yaml
diff --git a/...s/containerapp/tests/latest/recordings/test_containerapp_compose_create_with_secrets.yaml b/...s/containerapp/tests/latest/recordings/test_containerapp_compose_create_with_secrets.yaml
diff --git a/...st/recordings/test_containerapp_compose_create_with_secrets_and_existing_environment.yaml b/...st/recordings/test_containerapp_compose_create_with_secrets_and_existing_environment.yaml
diff --git a/...ings/test_containerapp_compose_create_with_secrets_and_existing_environment_conflict.yaml b/...ings/test_containerapp_compose_create_with_secrets_and_existing_environment_conflict.yaml
diff --git a/...ainerapp/tests/latest/recordings/test_containerapp_compose_create_with_transport_arg.yaml b/...ainerapp/tests/latest/recordings/test_containerapp_compose_create_with_transport_arg.yaml
diff --git a/.../tests/latest/recordings/test_containerapp_compose_create_with_transport_mapping_arg.yaml b/.../tests/latest/recordings/test_containerapp_compose_create_with_transport_mapping_arg.yaml
diff --git a/...les/containerapp/tests/latest/recordings/test_containerapp_compose_with_command_list.yaml b/...les/containerapp/tests/latest/recordings/test_containerapp_compose_with_command_list.yaml
diff --git a/...p/tests/latest/recordings/test_containerapp_compose_with_command_list_and_entrypoint.yaml b/...p/tests/latest/recordings/test_containerapp_compose_with_command_list_and_entrypoint.yaml
diff --git a/...s/containerapp/tests/latest/recordings/test_containerapp_compose_with_command_string.yaml b/...s/containerapp/tests/latest/recordings/test_containerapp_compose_with_command_string.yaml
diff --git a/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_cors_policy.yaml b/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_cors_policy.yaml
diff --git a/...latest/recordings/test_containerapp_create_enable_workload_profiles_three_state_flag.yaml b/...latest/recordings/test_containerapp_create_enable_workload_profiles_three_state_flag.yaml
diff --git a/...es/containerapp/tests/latest/recordings/test_containerapp_create_with_environment_id.yaml b/...es/containerapp/tests/latest/recordings/test_containerapp_create_with_environment_id.yaml
diff --git a/...modules/containerapp/tests/latest/recordings/test_containerapp_create_with_vnet_yaml.yaml b/...modules/containerapp/tests/latest/recordings/test_containerapp_create_with_vnet_yaml.yaml
diff --git a/...tainerapp/tests/latest/recordings/test_containerapp_create_with_workloadprofile_yaml.yaml b/...tainerapp/tests/latest/recordings/test_containerapp_create_with_workloadprofile_yaml.yaml
diff --git a/...mand_modules/containerapp/tests/latest/recordings/test_containerapp_create_with_yaml.yaml b/...mand_modules/containerapp/tests/latest/recordings/test_containerapp_create_with_yaml.yaml
diff --git a/.../cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_dapr_e2e.yaml b/.../cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_dapr_e2e.yaml
diff --git a/...azure/cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_e2e.yaml b/...azure/cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_e2e.yaml
diff --git a/...d_modules/containerapp/tests/latest/recordings/test_containerapp_env_certificate_e2e.yaml b/...d_modules/containerapp/tests/latest/recordings/test_containerapp_env_certificate_e2e.yaml
diff --git a/...nd_modules/containerapp/tests/latest/recordings/test_containerapp_env_custom_domains.yaml b/...nd_modules/containerapp/tests/latest/recordings/test_containerapp_env_custom_domains.yaml
diff --git a/...d_modules/containerapp/tests/latest/recordings/test_containerapp_env_dapr_components.yaml b/...d_modules/containerapp/tests/latest/recordings/test_containerapp_env_dapr_components.yaml
diff --git a/...e/cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_env_e2e.yaml b/...e/cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_env_e2e.yaml
diff --git a/...s/latest/recordings/test_containerapp_env_enable_workload_profiles_infer_env_type_v1.yaml b/...s/latest/recordings/test_containerapp_env_enable_workload_profiles_infer_env_type_v1.yaml
diff --git a/...s/latest/recordings/test_containerapp_env_enable_workload_profiles_infer_env_type_v2.yaml b/...s/latest/recordings/test_containerapp_env_enable_workload_profiles_infer_env_type_v2.yaml
diff --git a/...modules/containerapp/tests/latest/recordings/test_containerapp_env_internal_only_e2e.yaml b/...modules/containerapp/tests/latest/recordings/test_containerapp_env_internal_only_e2e.yaml
diff --git a/.../command_modules/containerapp/tests/latest/recordings/test_containerapp_env_logs_e2e.yaml b/.../command_modules/containerapp/tests/latest/recordings/test_containerapp_env_logs_e2e.yaml
diff --git a/.../cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_env_mtls.yaml b/.../cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_env_mtls.yaml
diff --git a/...les/containerapp/tests/latest/recordings/test_containerapp_env_update_custom_domains.yaml b/...les/containerapp/tests/latest/recordings/test_containerapp_env_update_custom_domains.yaml
diff --git a/.../containerapp/tests/latest/recordings/test_containerapp_env_workload_profiles_delete.yaml b/.../containerapp/tests/latest/recordings/test_containerapp_env_workload_profiles_delete.yaml
diff --git a/...les/containerapp/tests/latest/recordings/test_containerapp_env_workload_profiles_e2e.yaml b/...les/containerapp/tests/latest/recordings/test_containerapp_env_workload_profiles_e2e.yaml
diff --git a/...inerapp/tests/latest/recordings/test_containerapp_env_workload_profiles_e2e_no_waits.yaml b/...inerapp/tests/latest/recordings/test_containerapp_env_workload_profiles_e2e_no_waits.yaml
diff --git a/...s/containerapp/tests/latest/recordings/test_containerapp_eventjob_crudoperations_e2e.yaml b/...s/containerapp/tests/latest/recordings/test_containerapp_eventjob_crudoperations_e2e.yaml
diff --git a/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_eventstream.yaml b/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_eventstream.yaml
diff --git a/.../command_modules/containerapp/tests/latest/recordings/test_containerapp_identity_e2e.yaml b/.../command_modules/containerapp/tests/latest/recordings/test_containerapp_identity_e2e.yaml
diff --git a/...mmand_modules/containerapp/tests/latest/recordings/test_containerapp_identity_system.yaml b/...mmand_modules/containerapp/tests/latest/recordings/test_containerapp_identity_system.yaml
diff --git a/...command_modules/containerapp/tests/latest/recordings/test_containerapp_identity_user.yaml b/...command_modules/containerapp/tests/latest/recordings/test_containerapp_identity_user.yaml
diff --git a/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_ingress_e2e.yaml b/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_ingress_e2e.yaml
diff --git a/...d_modules/containerapp/tests/latest/recordings/test_containerapp_ingress_traffic_e2e.yaml b/...d_modules/containerapp/tests/latest/recordings/test_containerapp_ingress_traffic_e2e.yaml
diff --git a/...mmand_modules/containerapp/tests/latest/recordings/test_containerapp_ip_restrictions.yaml b/...mmand_modules/containerapp/tests/latest/recordings/test_containerapp_ip_restrictions.yaml
diff --git a/..._modules/containerapp/tests/latest/recordings/test_containerapp_ip_restrictions_deny.yaml b/..._modules/containerapp/tests/latest/recordings/test_containerapp_ip_restrictions_deny.yaml
diff --git a/...containerapp/tests/latest/recordings/test_containerapp_job_custom_executionstest_e2e.yaml b/...containerapp/tests/latest/recordings/test_containerapp_job_custom_executionstest_e2e.yaml
diff --git a/...odules/containerapp/tests/latest/recordings/test_containerapp_job_executionstest_e2e.yaml b/...odules/containerapp/tests/latest/recordings/test_containerapp_job_executionstest_e2e.yaml
diff --git a/...cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_logstream.yaml b/...cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_logstream.yaml
diff --git a/.../containerapp/tests/latest/recordings/test_containerapp_manualjob_crudoperations_e2e.yaml b/.../containerapp/tests/latest/recordings/test_containerapp_manualjob_crudoperations_e2e.yaml
diff --git a/...ntainerapp/tests/latest/recordings/test_containerapp_manualjob_private_registry_port.yaml b/...ntainerapp/tests/latest/recordings/test_containerapp_manualjob_private_registry_port.yaml
diff --git a/...tests/latest/recordings/test_containerapp_manualjob_registry_acr_look_up_credentical.yaml b/...tests/latest/recordings/test_containerapp_manualjob_registry_acr_look_up_credentical.yaml
diff --git a/.../tests/latest/recordings/test_containerapp_manualjob_withidentity_crudoperations_e2e.yaml b/.../tests/latest/recordings/test_containerapp_manualjob_withidentity_crudoperations_e2e.yaml
diff --git a/...pp/tests/latest/recordings/test_containerapp_manualjob_withsecret_crudoperations_e2e.yaml b/...pp/tests/latest/recordings/test_containerapp_manualjob_withsecret_crudoperations_e2e.yaml
diff --git a/...modules/containerapp/tests/latest/recordings/test_containerapp_private_registry_port.yaml b/...modules/containerapp/tests/latest/recordings/test_containerapp_private_registry_port.yaml
diff --git a/...tainerapp/tests/latest/recordings/test_containerapp_registry_acr_look_up_credentical.yaml b/...tainerapp/tests/latest/recordings/test_containerapp_registry_acr_look_up_credentical.yaml
diff --git a/.../command_modules/containerapp/tests/latest/recordings/test_containerapp_registry_msi.yaml b/.../command_modules/containerapp/tests/latest/recordings/test_containerapp_registry_msi.yaml
diff --git a/...nd_modules/containerapp/tests/latest/recordings/test_containerapp_revision_label_e2e.yaml b/...nd_modules/containerapp/tests/latest/recordings/test_containerapp_revision_label_e2e.yaml
diff --git a/.../command_modules/containerapp/tests/latest/recordings/test_containerapp_scale_create.yaml b/.../command_modules/containerapp/tests/latest/recordings/test_containerapp_scale_create.yaml
diff --git a/...d_modules/containerapp/tests/latest/recordings/test_containerapp_scale_revision_copy.yaml b/...d_modules/containerapp/tests/latest/recordings/test_containerapp_scale_revision_copy.yaml
diff --git a/.../command_modules/containerapp/tests/latest/recordings/test_containerapp_scale_update.yaml b/.../command_modules/containerapp/tests/latest/recordings/test_containerapp_scale_update.yaml
diff --git a/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_tcp_ingress.yaml b/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_tcp_ingress.yaml
diff --git a/...tainerapp/tests/latest/recordings/test_containerapp_termination_grace_period_seconds.yaml b/...tainerapp/tests/latest/recordings/test_containerapp_termination_grace_period_seconds.yaml
diff --git a/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_up_dapr_e2e.yaml b/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_up_dapr_e2e.yaml
diff --git a/...re/cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_update.yaml b/...re/cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_update.yaml
diff --git a/...and_modules/containerapp/tests/latest/recordings/test_containerapp_update_containers.yaml b/...and_modules/containerapp/tests/latest/recordings/test_containerapp_update_containers.yaml
diff --git a/...containerapp/tests/latest/recordings/test_containerappjob_create_with_environment_id.yaml b/...containerapp/tests/latest/recordings/test_containerappjob_create_with_environment_id.yaml
diff --git a/...d_modules/containerapp/tests/latest/recordings/test_containerappjob_create_with_yaml.yaml b/...d_modules/containerapp/tests/latest/recordings/test_containerappjob_create_with_yaml.yaml
diff --git a/...inerapp/tests/latest/recordings/test_containerappjob_eventtriggered_create_with_yaml.yaml b/...inerapp/tests/latest/recordings/test_containerappjob_eventtriggered_create_with_yaml.yaml
diff --git a/...li/azure/cli/command_modules/containerapp/tests/latest/test_containerapp_auth_commands.py b/...li/azure/cli/command_modules/containerapp/tests/latest/test_containerapp_auth_commands.py
@@ -5,10 +5,11 @@
 
 
 from azure.cli.testsdk.scenario_tests import AllowLargeResponse
-from azure.cli.testsdk import (ScenarioTest, ResourceGroupPreparer, JMESPathCheck, LogAnalyticsWorkspacePreparer)
+from azure.cli.testsdk import (ScenarioTest, ResourceGroupPreparer, JMESPathCheck)
 
 from .common import TEST_LOCATION
-from .utils import create_containerapp_env
+from .utils import prepare_containerapp_env_for_app_e2e_tests
+
 
 # flake8: noqa
 # noqa
@@ -21,15 +22,13 @@ def __init__(self, *arg, **kwargs):
 
     @AllowLargeResponse(8192)
     @ResourceGroupPreparer(location=TEST_LOCATION)
-    @LogAnalyticsWorkspacePreparer(location="eastus", get_shared_key=True)
-    def test_containerapp_auth_e2e(self, resource_group, laworkspace_customer_id, laworkspace_shared_key):
+    def test_containerapp_auth_e2e(self, resource_group):
         self.cmd('configure --defaults location={}'.format(TEST_LOCATION))
-        env = self.create_random_name(prefix='containerapp-env', length=24)
         app = self.create_random_name(prefix='containerapp-auth', length=24)
 
-        create_containerapp_env(self, env, resource_group, logs_workspace=laworkspace_customer_id, logs_workspace_shared_key=laworkspace_shared_key)
+        env_id = prepare_containerapp_env_for_app_e2e_tests(self)
 
-        self.cmd('containerapp create -g {} -n {} --environment {} --image mcr.microsoft.com/k8se/quickstart:latest --ingress external --target-port 80'.format(resource_group, app, env))
+        self.cmd('containerapp create -g {} -n {} --environment {} --image mcr.microsoft.com/k8se/quickstart:latest --ingress external --target-port 80'.format(resource_group, app, env_id))
 
         client_id = 'abc123'
         test_secret = 'abc123'
@@ -102,17 +101,15 @@ def test_containerapp_auth_e2e(self, resource_group, laworkspace_customer_id, la
 
     @AllowLargeResponse(8192)
     @ResourceGroupPreparer(location=TEST_LOCATION)
-    @LogAnalyticsWorkspacePreparer(location="eastus", get_shared_key=True)
-    def test_containerapp_auth_facebook_e2e(self, resource_group, laworkspace_customer_id, laworkspace_shared_key):
+    def test_containerapp_auth_facebook_e2e(self, resource_group):
         self.cmd('configure --defaults location={}'.format(TEST_LOCATION))
-        env = self.create_random_name(prefix='containerapp-env', length=24)
         app = self.create_random_name(prefix='containerapp-auth', length=24)
 
-        create_containerapp_env(self, env, resource_group, logs_workspace=laworkspace_customer_id, logs_workspace_shared_key=laworkspace_shared_key)
+        env_id = prepare_containerapp_env_for_app_e2e_tests(self)
 
         self.cmd(
             'containerapp create -g {} -n {} --environment {} --image mcr.microsoft.com/k8se/quickstart:latest --ingress external --target-port 80'.format(
-                resource_group, app, env))
+                resource_group, app, env_id))
 
         app_id = 'abc123'
         test_secret = 'abc123'
@@ -141,17 +138,15 @@ def test_containerapp_auth_facebook_e2e(self, resource_group, laworkspace_custom
 
     @AllowLargeResponse(8192)
     @ResourceGroupPreparer(location=TEST_LOCATION)
-    @LogAnalyticsWorkspacePreparer(location="eastus", get_shared_key=True)
-    def test_containerapp_auth_github_e2e(self, resource_group, laworkspace_customer_id, laworkspace_shared_key):
+    def test_containerapp_auth_github_e2e(self, resource_group):
         self.cmd('configure --defaults location={}'.format(TEST_LOCATION))
-        env = self.create_random_name(prefix='containerapp-env', length=24)
         app = self.create_random_name(prefix='containerapp-auth', length=24)
 
-        create_containerapp_env(self, env, resource_group, logs_workspace=laworkspace_customer_id, logs_workspace_shared_key=laworkspace_shared_key)
+        env_id = prepare_containerapp_env_for_app_e2e_tests(self)
 
         self.cmd(
             'containerapp create -g {} -n {} --environment {} --image mcr.microsoft.com/k8se/quickstart:latest --ingress external --target-port 80'.format(
-                resource_group, app, env))
+                resource_group, app, env_id))
 
         client_id = 'abc123'
         test_secret = 'abc123'
@@ -175,7 +170,7 @@ def test_containerapp_auth_github_e2e(self, resource_group, laworkspace_customer
 
         self.cmd(
             'containerapp create -g {} -n {} --environment {} --image mcr.microsoft.com/k8se/quickstart:latest --ingress external --target-port 80'.format(
-                resource_group, app, env))
+                resource_group, app, env_id))
 
         self.cmd(
             'containerapp auth google update -g {} --name {} --client-id {} --client-secret {} --yes'
@@ -195,7 +190,7 @@ def test_containerapp_auth_github_e2e(self, resource_group, laworkspace_customer
 
         self.cmd(
             'containerapp create -g {} -n {} --environment {} --image mcr.microsoft.com/k8se/quickstart:latest --ingress external --target-port 80'.format(
-                resource_group, app, env))
+                resource_group, app, env_id))
 
         self.cmd(
             'containerapp auth apple update -g {} --name {} --client-id {} --client-secret {} --yes'
@@ -215,7 +210,7 @@ def test_containerapp_auth_github_e2e(self, resource_group, laworkspace_customer
 
         self.cmd(
             'containerapp create -g {} -n {} --environment {} --image mcr.microsoft.com/k8se/quickstart:latest --ingress external --target-port 80'.format(
-                resource_group, app, env))
+                resource_group, app, env_id))
 
         self.cmd(
             'containerapp auth twitter update -g {} --name {} --consumer-key {} --consumer-secret {} --yes'
@@ -238,17 +233,15 @@ def test_containerapp_auth_github_e2e(self, resource_group, laworkspace_customer
 
     @AllowLargeResponse(8192)
     @ResourceGroupPreparer(location=TEST_LOCATION)
-    @LogAnalyticsWorkspacePreparer(location="eastus", get_shared_key=True)
     def test_containerapp_auth_openid_connect_e2e(self, resource_group):
         self.cmd('configure --defaults location={}'.format(TEST_LOCATION))
-        env = self.create_random_name(prefix='containerapp-env', length=24)
         app = self.create_random_name(prefix='containerapp-auth', length=24)
 
-        create_containerapp_env(self, env, resource_group)
+        env_id = prepare_containerapp_env_for_app_e2e_tests(self)
 
         self.cmd(
             'containerapp create -g {} -n {} --environment {} --image mcr.microsoft.com/k8se/quickstart:latest --ingress external --target-port 80'.format(
-                resource_group, app, env))
+                resource_group, app, env_id))
 
         client_id = 'abc123'
         test_secret = 'abc123'
@@ -257,7 +250,7 @@ def test_containerapp_auth_openid_connect_e2e(self, resource_group):
         app = self.create_random_name(prefix='containerapp-auth', length=24)
         self.cmd(
             'containerapp create -g {} -n {} --environment {} --image mcr.microsoft.com/k8se/quickstart:latest --ingress external --target-port 80'.format(
-                resource_group, app, env))
+                resource_group, app, env_id))
 
         provider_name = "customopenid"
         configuration = "test-openid-configuration"