containerapp allow yaml without environment

src/containerapp/HISTORY.rst

@@ -7,6 +7,7 @@ upcoming
 * Removed preview tag for some command groups and params (e.g. 'az containerapp job', 'az containerapp env storage', 'az containerapp env workload-profile')
 * 'az containerapp env': --enable-workload-profiles allowed values:true, false
 * 'az containerapp auth': support --token-store, --sas-url-secret, --sas-url-secret-name, --yes
+* 'az containerapp create'/'az containerapp job create': When --environment is provided and the environmentId value does not exist in --yaml, use the value in --environment as environmentId
 
 0.3.37
 ++++++

src/containerapp/azext_containerapp/containerapp_decorator.py

@@ -605,7 +605,7 @@ def post_process(self, r):
         return r
 
     def set_up_create_containerapp_yaml(self, name, file_name):
-        if self.get_argument_image() or self.get_argument_managed_env() or self.get_argument_min_replicas() or self.get_argument_max_replicas() or self.get_argument_target_port() or self.get_argument_ingress() or \
+        if self.get_argument_image() or self.get_argument_min_replicas() or self.get_argument_max_replicas() or self.get_argument_target_port() or self.get_argument_ingress() or \
                 self.get_argument_revisions_mode() or self.get_argument_secrets() or self.get_argument_env_vars() or self.get_argument_cpu() or self.get_argument_memory() or self.get_argument_registry_server() or \
                 self.get_argument_registry_user() or self.get_argument_registry_pass() or self.get_argument_dapr_enabled() or self.get_argument_dapr_app_port() or self.get_argument_dapr_app_id() or \
                 self.get_argument_startup_command() or self.get_argument_args() or self.get_argument_tags():
@@ -660,15 +660,19 @@ def set_up_create_containerapp_yaml(self, name, file_name):
             del self.containerapp_def["workloadProfileName"]
 
         # Validate managed environment
+        env_id = self.containerapp_def["properties"]['environmentId']
+        env_info = None
+        if self.get_argument_managed_env():
+            if not self.get_argument_disable_warnings() and env_id is not None and env_id != self.get_argument_managed_env():
+                logger.warning('The environmentId was passed along with --yaml. The value entered with --environment will be ignored, and the configuration defined in the yaml will be used instead')
+            if env_id is None:
+                env_id = self.get_argument_managed_env()
+                safe_set(self.containerapp_def, "properties", "environmentId", value=env_id)
+
         if not self.containerapp_def["properties"].get('environmentId'):
             raise RequiredArgumentMissingError(
                 'environmentId is required. This can be retrieved using the `az containerapp env show -g MyResourceGroup -n MyContainerappEnvironment --query id` command. Please see https://aka.ms/azure-container-apps-yaml for a valid containerapps YAML spec.')
 
-        env_id = self.containerapp_def["properties"]['environmentId']
-        env_name = None
-        env_rg = None
-        env_info = None
-
         if is_valid_resource_id(env_id):
             parsed_managed_env = parse_resource_id(env_id)
             env_name = parsed_managed_env['name']

src/containerapp/azext_containerapp/containerapp_job_decorator.py

@@ -405,7 +405,7 @@ def construct_payload(self):
                 set_managed_identity(self.cmd, self.get_argument_resource_group_name(), self.containerappjob_def, user_assigned=[self.get_argument_registry_identity()])
 
     def set_up_create_containerapp_job_yaml(self, name, file_name):
-        if self.get_argument_image() or self.get_argument_managed_env() or self.get_argument_trigger_type() or self.get_argument_replica_timeout() or self.get_argument_replica_retry_limit() or \
+        if self.get_argument_image() or self.get_argument_trigger_type() or self.get_argument_replica_timeout() or self.get_argument_replica_retry_limit() or \
                 self.get_argument_replica_completion_count() or self.get_argument_parallelism() or self.get_argument_cron_expression() or self.get_argument_cpu() or self.get_argument_memory() or self.get_argument_registry_server() or \
                 self.get_argument_registry_user() or self.get_argument_registry_pass() or self.get_argument_secrets() or self.get_argument_env_vars() or \
                 self.get_argument_startup_command() or self.get_argument_args() or self.get_argument_tags():
@@ -460,15 +460,19 @@ def set_up_create_containerapp_job_yaml(self, name, file_name):
             del self.containerappjob_def["workloadProfileName"]
 
         # Validate managed environment
+        env_id = self.containerappjob_def["properties"]['environmentId']
+        env_info = None
+        if self.get_argument_managed_env():
+            if not self.get_argument_disable_warnings() and env_id is not None and env_id != self.get_argument_managed_env():
+                logger.warning('The environmentId was passed along with --yaml. The value entered with --environment will be ignored, and the configuration defined in the yaml will be used instead')
+            if env_id is None:
+                env_id = self.get_argument_managed_env()
+                safe_set(self.containerappjob_def, "properties", "environmentId", value=env_id)
+
         if not self.containerappjob_def["properties"].get('environmentId'):
             raise RequiredArgumentMissingError(
                 'environmentId is required. This can be retrieved using the `az containerapp env show -g MyResourceGroup -n MyContainerappEnvironment --query id` command. Please see https://aka.ms/azure-container-apps-yaml for a valid containerapps YAML spec.')
 
-        env_id = self.containerappjob_def["properties"]['environmentId']
-        env_name = None
-        env_rg = None
-        env_info = None
-
         if is_valid_resource_id(env_id):
             parsed_managed_env = parse_resource_id(env_id)
             env_name = parsed_managed_env['name']