Skip to content

[container app] Fix #28226: az containerapp job update: Update existing scale rules if --scale-rule-name is passed #28408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhoxing-ms merged 6 commits into from
Feb 22, 2024
Merged

[container app] Fix #28226: az containerapp job update: Update existing scale rules if --scale-rule-name is passed #28408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
825328f
change to add scale rules on job update
Feb 20, 2024
d181d01
change to add scale rules on job update
Feb 20, 2024
345056f
change to add scale rules on job update
Feb 20, 2024
9f9eba9
change to add scale rules on job update
Feb 21, 2024
c4f4f58
change to add scale rules on job update
Feb 21, 2024
5a94f4a
change to add scale rules on job update
Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions src/azure-cli/azure/cli/command_modules/containerapp/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
RegistryCredentials as RegistryCredentialsModel,
ContainerResources as ContainerResourcesModel,
Scale as ScaleModel,
JobScale as JobScaleModel,
Container as ContainerModel,
GitHubActionConfiguration,
RegistryInfo as RegistryInfoModel,
Expand Down Expand Up @@ -1201,16 +1200,7 @@ def update_containerappsjob_logic(cmd,
eventTriggerConfig_def["scale"]["maxExecutions"] = max_executions
if polling_interval is not None:
eventTriggerConfig_def["scale"]["pollingInterval"] = polling_interval

scale_def = None
if min_executions is not None or max_executions is not None or polling_interval is not None:
scale_def = JobScaleModel
scale_def["pollingInterval"] = polling_interval
scale_def["minExecutions"] = min_executions
scale_def["maxReplicas"] = max_executions
# so we don't overwrite rules
if safe_get(new_containerappsjob, "properties", "template", "scale", "rules"):
new_containerappsjob["properties"]["template"]["scale"].pop(["rules"])
# ScaleRule
if scale_rule_name:
scale_rule_type = scale_rule_type.lower()
scale_rule_def = ScaleRuleModel
Expand All @@ -1221,10 +1211,17 @@ def update_containerappsjob_logic(cmd,
scale_rule_def["type"] = scale_rule_type
scale_rule_def["metadata"] = metadata_def
scale_rule_def["auth"] = auth_def
if not scale_def:
scale_def = JobScaleModel
scale_def["rules"] = [scale_rule_def]
eventTriggerConfig_def["scale"]["rules"] = scale_def["rules"]
if safe_get(eventTriggerConfig_def, "scale", "rules") is None:
eventTriggerConfig_def["scale"]["rules"] = []
existing_rules = eventTriggerConfig_def["scale"]["rules"]
updated_rule = False
for rule in existing_rules:
if rule["name"] == scale_rule_name:
rule.update(scale_rule_def)
updated_rule = True
break
if not updated_rule:
existing_rules.append(scale_rule_def)

new_containerappsjob["properties"]["configuration"]["eventTriggerConfig"] = eventTriggerConfig_def

Expand Down
Loading