Fixed bug. Renamed test with existing name. Added new test recording …

…to ci suppressions. Reran tests. (Azure#135) Co-authored-by: Haroon Feisal <haroonfeisal@microsoft.com>
runefa · Jul 15, 2022 · 9f28b52 · 9f28b52
1 parent 4995049
commit 9f28b52
Show file tree

Hide file tree

Showing 7 changed files with 6,586 additions and 2,027 deletions.
diff --git a/scripts/ci/credscan/CredScanSuppressions.json b/scripts/ci/credscan/CredScanSuppressions.json
@@ -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)"
     },

diff --git a/src/containerapp/azext_containerapp/custom.py b/src/containerapp/azext_containerapp/custom.py
@@ -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)

diff --git a/src/containerapp/azext_containerapp/tests/latest/recordings/test_container_acr.yaml b/src/containerapp/azext_containerapp/tests/latest/recordings/test_container_acr.yaml
diff --git a/...app/azext_containerapp/tests/latest/recordings/test_containerapp_ingress_traffic_e2e.yaml b/...app/azext_containerapp/tests/latest/recordings/test_containerapp_ingress_traffic_e2e.yaml
diff --git a/src/containerapp/azext_containerapp/tests/latest/recordings/test_containerapp_update.yaml b/src/containerapp/azext_containerapp/tests/latest/recordings/test_containerapp_update.yaml
diff --git a/...erapp/azext_containerapp/tests/latest/recordings/test_containerapp_update_containers.yaml b/...erapp/azext_containerapp/tests/latest/recordings/test_containerapp_update_containers.yaml
diff --git a/src/containerapp/azext_containerapp/tests/latest/test_containerapp_scenario.py b/src/containerapp/azext_containerapp/tests/latest/test_containerapp_scenario.py
@@ -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)