Skip to content

Fixed bug with patchupdate and --revision-suffix. Renamed test with existing name. Added new test recording … #135

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
runefa merged 1 commit into from
Jul 15, 2022
Merged

Fixed bug with patchupdate and --revision-suffix. Renamed test with existing name. Added new test recording … #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion scripts/ci/credscan/CredScanSuppressions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@
"src\\containerapp\\azext_containerapp\\tests\\latest\\cert.pfx",
"src\\containerapp\\azext_containerapp\\tests\\latest\\test_containerapp_commands.py",
"src\\containerapp\\azext_containerapp\\tests\\latest\\test_containerapp_env_commands.py",
"src\\containerapp\\azext_containerapp\\tests\\latest\\recordings\\test_containerapp_registry_msi.yaml"
"src\\containerapp\\azext_containerapp\\tests\\latest\\recordings\\test_containerapp_registry_msi.yaml",
"src\\containerapp\\azext_containerapp\\tests\\latest\\recordings\\test_containerapp_update_containers.yaml"
],
"_justification": "Dummy resources' keys left during testing Microsoft.App (required for log-analytics to create managedEnvironments)"
},
Expand Down
4 changes: 4 additions & 0 deletions src/containerapp/azext_containerapp/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,10 @@ def update_containerapp_logic(cmd,

registries_def.append(registry)

if not revision_suffix:
new_containerapp["properties"]["template"] = {} if "template" not in new_containerapp["properties"] else new_containerapp["properties"]["template"]
new_containerapp["properties"]["template"]["revisionSuffix"] = None

try:
r = ContainerAppClient.update(
cmd=cmd, resource_group_name=resource_group_name, name=name, container_app_envelope=new_containerapp, no_wait=no_wait)
Expand Down
2,068 changes: 1,382 additions & 686 deletions src/containerapp/azext_containerapp/tests/latest/recordings/test_container_acr.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,116 changes: 625 additions & 491 deletions ...app/azext_containerapp/tests/latest/recordings/test_containerapp_ingress_traffic_e2e.yaml
View file
Open in desktop

Large diffs are not rendered by default.

1,717 changes: 869 additions & 848 deletions src/containerapp/azext_containerapp/tests/latest/recordings/test_containerapp_update.yaml
View file
Open in desktop

Large diffs are not rendered by default.

3,703 changes: 3,703 additions & 0 deletions ...erapp/azext_containerapp/tests/latest/recordings/test_containerapp_update_containers.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/containerapp/azext_containerapp/tests/latest/test_containerapp_scenario.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def test_container_acr(self, resource_group):
# TODO rename
@AllowLargeResponse(8192)
@ResourceGroupPreparer(location="northeurope")
def test_containerapp_update(self, resource_group):
def test_containerapp_update_containers(self, resource_group):
env_name = self.create_random_name(prefix='containerapp-e2e-env', length=24)
logs_workspace_name = self.create_random_name(prefix='containerapp-env', length=24)

Expand Down