Skip to content

Anfranci/fix update cmd for jobs #6310

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
Xing Zhou (zhoxing-ms) merged 6 commits into from
May 25, 2023
Merged

Anfranci/fix update cmd for jobs #6310

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b526f52
fix for update command for job resources
anandanthony May 22, 2023
d086a60
fix for update command for job resources
anandanthony May 22, 2023
948118d
fix for update command for job resources
anandanthony May 23, 2023
92bec3b
fix for update command for job resources
anandanthony May 23, 2023
9bcc9a0
fix for update command for job resources
anandanthony May 23, 2023
d8cb971
fix for update command for job resources
anandanthony May 24, 2023
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
15 changes: 6 additions & 9 deletions src/containerapp/azext_containerapp/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1933,7 +1933,7 @@ def update_containerappsjob_logic(cmd,

update_map = {}
update_map['replicaConfigurations'] = replica_timeout or replica_retry_limit
update_map['triggerConfigurations'] = replica_completion_count or parallelism or cron_expression or scale_rule_name
update_map['triggerConfigurations'] = replica_completion_count or parallelism or cron_expression or scale_rule_name or scale_rule_type or scale_rule_auth or polling_interval or min_executions or max_executions
update_map['container'] = image or container_name or set_env_vars is not None or remove_env_vars is not None or replace_env_vars is not None or remove_all_env_vars or cpu or memory or startup_command is not None or args is not None
update_map['registry'] = registry_server or registry_user or registry_pass

Expand Down Expand Up @@ -1992,14 +1992,13 @@ def update_containerappsjob_logic(cmd,
if containerappsjob_def["properties"]["configuration"]["triggerType"] == "Event":
eventTriggerConfig_def = None
eventTriggerConfig_def = containerappsjob_def["properties"]["configuration"]["eventTriggerConfig"]
if replica_completion_count is not None or parallelism is not None:
if replica_completion_count is not None or parallelism is not None or min_executions is not None or max_executions is not None or polling_interval is not None or scale_rule_name is not None:
if replica_completion_count:
eventTriggerConfig_def["replicaCompletionCount"] = replica_completion_count
if parallelism:
eventTriggerConfig_def["parallelism"] = parallelism

# Scale
if "scale" not in eventTriggerConfig_def["properties"]["template"]:
if "scale" in eventTriggerConfig_def["scale"]:
eventTriggerConfig_def["scale"] = {}
if min_executions is not None:
eventTriggerConfig_def["scale"]["minExecutions"] = min_executions
Expand All @@ -2014,12 +2013,10 @@ def update_containerappsjob_logic(cmd,
scale_def["pollingInterval"] = polling_interval
scale_def["minExecutions"] = min_executions
scale_def["maxReplicas"] = max_executions
# so we don't overwrite rules
if safe_get(eventTriggerConfig_def, "scale", "rules"):
eventTriggerConfig_def["scale"].pop(["rules"])
# # so we don't overwrite rules
if safe_get(new_containerappsjob, "properties", "template", "scale", "rules"):
new_containerappsjob["properties"]["template"]["scale"].pop(["rules"])
if scale_rule_name:
if not scale_rule_type:
scale_rule_type = "http"
scale_rule_type = scale_rule_type.lower()
scale_rule_def = ScaleRuleModel
curr_metadata = {}
Expand Down
Loading