Skip to content

Commit da8aea6

Browse files
authored
[Container app] az containerapp env workload-profile add: Simplify workload-profile creation with default profile name (#32713)
1 parent 5192188 commit da8aea6

File tree

5 files changed

+11343
-3
lines changed

5 files changed

+11343
-3
lines changed

src/azure-cli/azure/cli/command_modules/containerapp/containerapp_env_decorator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,10 +365,12 @@ def set_up_workload_profiles(self, r):
365365
workload_profile_name = self.get_argument_workload_profile_name()
366366
workload_profile_type = self.get_argument_workload_profile_type()
367367

368+
workload_profile_name = workload_profile_type if workload_profile_name is None else workload_profile_name
369+
368370
if workload_profile_name:
369371
if "workloadProfiles" not in r["properties"] or not r["properties"]["workloadProfiles"]:
370372
raise ValidationError(
371-
"This environment does not allow for workload profiles. Can create a compatible environment with 'az containerapp env create --enable-workload-profiles'")
373+
"This environment does not allow for workload profiles. You can create a compatible environment with 'az containerapp env create --enable-workload-profiles'")
372374

373375
if workload_profile_type:
374376
workload_profile_type = workload_profile_type.upper()

src/azure-cli/azure/cli/command_modules/containerapp/custom.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5035,7 +5035,7 @@ def set_workload_profile(cmd, resource_group_name, env_name, workload_profile_na
50355035
return update_managed_environment(cmd, env_name, resource_group_name, workload_profile_type=workload_profile_type, workload_profile_name=workload_profile_name, min_nodes=min_nodes, max_nodes=max_nodes)
50365036

50375037

5038-
def add_workload_profile(cmd, resource_group_name, env_name, workload_profile_name, workload_profile_type=None, min_nodes=None, max_nodes=None):
5038+
def add_workload_profile(cmd, resource_group_name, env_name, workload_profile_name=None, workload_profile_type=None, min_nodes=None, max_nodes=None):
50395039
r = None
50405040
try:
50415041
r = ManagedEnvironmentClient.show(cmd=cmd, resource_group_name=resource_group_name, name=env_name)
@@ -5050,7 +5050,7 @@ def add_workload_profile(cmd, resource_group_name, env_name, workload_profile_na
50505050

50515051
workload_profiles_lower = [p["name"].lower() for p in workload_profiles]
50525052

5053-
if workload_profile_name.lower() in workload_profiles_lower:
5053+
if workload_profile_name and workload_profile_name.lower() in workload_profiles_lower:
50545054
raise ValidationError(f"Cannot add workload profile with name {workload_profile_name} because it already exists in this environment")
50555055

50565056
return update_managed_environment(cmd, env_name, resource_group_name, workload_profile_type=workload_profile_type, workload_profile_name=workload_profile_name, min_nodes=min_nodes, max_nodes=max_nodes)

0 commit comments

Comments
 (0)