[Containerapp] Fix Azure#30053: az containerapp update: Fix polling (…

…Azure#30078)
almasak · Oct 15, 2024 · f80083f · f80083f
1 parent a54dce2
commit f80083f
Show file tree

Hide file tree

Showing 80 changed files with 116,607 additions and 77,735 deletions.
diff --git a/src/azure-cli/azure/cli/command_modules/containerapp/_clients.py b/src/azure-cli/azure/cli/command_modules/containerapp/_clients.py
@@ -159,12 +159,18 @@ def update(cls, cmd, resource_group_name, name, container_app_envelope, no_wait=
         if no_wait:
             return
         elif r.status_code == 202:
-            operation_url = r.headers.get(HEADER_LOCATION)
-            response = poll_results(cmd, operation_url)
-            if response is None:
-                raise ResourceNotFoundError("Could not find a container app")
+            operation_url = r.headers.get(HEADER_AZURE_ASYNC_OPERATION)
+            if operation_url:
+                poll_status(cmd, operation_url)
+                r = send_raw_request(cmd.cli_ctx, "GET", request_url)
+                return r.json()
             else:
-                return response
+                operation_url = r.headers.get(HEADER_LOCATION)
+                r = poll_results(cmd, operation_url)
+                if r is None:
+                    raise ResourceNotFoundError("Could not find a container app")
+                else:
+                    return r
 
         return r.json()
 

diff --git a/...li/azure/cli/command_modules/containerapp/tests/latest/recordings/test_container_acr.yaml b/...li/azure/cli/command_modules/containerapp/tests/latest/recordings/test_container_acr.yaml
diff --git a/.../cli/command_modules/containerapp/tests/latest/recordings/test_container_acr_env_var.yaml b/.../cli/command_modules/containerapp/tests/latest/recordings/test_container_acr_env_var.yaml
diff --git a/..._modules/containerapp/tests/latest/recordings/test_container_app_mount_azurefile_e2e.yaml b/..._modules/containerapp/tests/latest/recordings/test_container_app_mount_azurefile_e2e.yaml
diff --git a/...nd_modules/containerapp/tests/latest/recordings/test_containerapp_anonymous_registry.yaml b/...nd_modules/containerapp/tests/latest/recordings/test_containerapp_anonymous_registry.yaml
diff --git a/.../cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_auth_e2e.yaml b/.../cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_auth_e2e.yaml
diff --git a/...and_modules/containerapp/tests/latest/recordings/test_containerapp_auth_facebook_e2e.yaml b/...and_modules/containerapp/tests/latest/recordings/test_containerapp_auth_facebook_e2e.yaml
diff --git a/...mmand_modules/containerapp/tests/latest/recordings/test_containerapp_auth_github_e2e.yaml b/...mmand_modules/containerapp/tests/latest/recordings/test_containerapp_auth_github_e2e.yaml
diff --git a/...dules/containerapp/tests/latest/recordings/test_containerapp_auth_openid_connect_e2e.yaml b/...dules/containerapp/tests/latest/recordings/test_containerapp_auth_openid_connect_e2e.yaml
diff --git a/...ts/latest/recordings/test_containerapp_compose_create_environment_to_target_location.yaml b/...ts/latest/recordings/test_containerapp_compose_create_environment_to_target_location.yaml
@@ -2160,7 +2160,7 @@ interactions:
 - request:
     body: '{"location": "eastus", "tags": null, "properties": {"daprAIInstrumentationKey":
       null, "vnetConfiguration": null, "appLogsConfiguration": {"destination": "log-analytics",
-      "logAnalyticsConfiguration": {"customerId": "f7537ee5-683d-40e8-af12-642df70dc447",
+      "logAnalyticsConfiguration": {"customerId": "veryFakedCustomerId==",
       "sharedKey":"abc123"}},
       "customDomainConfiguration": null, "workloadProfiles": [{"workloadProfileType":
       "Consumption", "Name": "Consumption"}], "zoneRedundant": false}}'

diff --git a/...ntainerapp/tests/latest/recordings/test_containerapp_compose_create_with_environment.yaml b/...ntainerapp/tests/latest/recordings/test_containerapp_compose_create_with_environment.yaml
diff --git a/...app/tests/latest/recordings/test_containerapp_compose_create_with_environment_prompt.yaml b/...app/tests/latest/recordings/test_containerapp_compose_create_with_environment_prompt.yaml
diff --git a/...erapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_internal.yaml b/...erapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_internal.yaml
diff --git a/...inerapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_prompt.yaml b/...inerapp/tests/latest/recordings/test_containerapp_compose_create_with_ingress_prompt.yaml
diff --git a/...rapp/tests/latest/recordings/test_containerapp_compose_create_with_registry_all_args.yaml b/...rapp/tests/latest/recordings/test_containerapp_compose_create_with_registry_all_args.yaml
diff --git a/...sts/latest/recordings/test_containerapp_compose_create_with_registry_server_arg_only.yaml b/...sts/latest/recordings/test_containerapp_compose_create_with_registry_server_arg_only.yaml
diff --git a/...rdings/test_containerapp_compose_create_with_resources_from_both_cpus_and_deploy_cpu.yaml b/...rdings/test_containerapp_compose_create_with_resources_from_both_cpus_and_deploy_cpu.yaml
diff --git a/...ts/latest/recordings/test_containerapp_compose_create_with_resources_from_deploy_cpu.yaml b/...ts/latest/recordings/test_containerapp_compose_create_with_resources_from_deploy_cpu.yaml
diff --git a/.../latest/recordings/test_containerapp_compose_create_with_resources_from_service_cpus.yaml b/.../latest/recordings/test_containerapp_compose_create_with_resources_from_service_cpus.yaml
diff --git a/...s/containerapp/tests/latest/recordings/test_containerapp_compose_create_with_secrets.yaml b/...s/containerapp/tests/latest/recordings/test_containerapp_compose_create_with_secrets.yaml
diff --git a/...st/recordings/test_containerapp_compose_create_with_secrets_and_existing_environment.yaml b/...st/recordings/test_containerapp_compose_create_with_secrets_and_existing_environment.yaml
diff --git a/...ings/test_containerapp_compose_create_with_secrets_and_existing_environment_conflict.yaml b/...ings/test_containerapp_compose_create_with_secrets_and_existing_environment_conflict.yaml
diff --git a/...s/containerapp/tests/latest/recordings/test_containerapp_compose_with_command_string.yaml b/...s/containerapp/tests/latest/recordings/test_containerapp_compose_with_command_string.yaml
diff --git a/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_cors_policy.yaml b/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_cors_policy.yaml
diff --git a/...es/containerapp/tests/latest/recordings/test_containerapp_create_with_environment_id.yaml b/...es/containerapp/tests/latest/recordings/test_containerapp_create_with_environment_id.yaml
diff --git a/...modules/containerapp/tests/latest/recordings/test_containerapp_create_with_vnet_yaml.yaml b/...modules/containerapp/tests/latest/recordings/test_containerapp_create_with_vnet_yaml.yaml
diff --git a/...mand_modules/containerapp/tests/latest/recordings/test_containerapp_create_with_yaml.yaml b/...mand_modules/containerapp/tests/latest/recordings/test_containerapp_create_with_yaml.yaml
diff --git a/...nd_modules/containerapp/tests/latest/recordings/test_containerapp_custom_domains_e2e.yaml b/...nd_modules/containerapp/tests/latest/recordings/test_containerapp_custom_domains_e2e.yaml
diff --git a/.../cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_dapr_e2e.yaml b/.../cli/command_modules/containerapp/tests/latest/recordings/test_containerapp_dapr_e2e.yaml
diff --git a/...ests/latest/recordings/test_containerapp_env_certificate_and_managed_certificate_e2e.yaml b/...ests/latest/recordings/test_containerapp_env_certificate_and_managed_certificate_e2e.yaml
diff --git a/...d_modules/containerapp/tests/latest/recordings/test_containerapp_env_certificate_e2e.yaml b/...d_modules/containerapp/tests/latest/recordings/test_containerapp_env_certificate_e2e.yaml
diff --git a/...sts/latest/recordings/test_containerapp_env_certificate_upload_with_certificate_name.yaml b/...sts/latest/recordings/test_containerapp_env_certificate_upload_with_certificate_name.yaml
diff --git a/...es/containerapp/tests/latest/recordings/test_containerapp_env_dapr_connection_string.yaml b/...es/containerapp/tests/latest/recordings/test_containerapp_env_dapr_connection_string.yaml
diff --git a/...dules/containerapp/tests/latest/recordings/test_containerapp_env_deprecate_arguments.yaml b/...dules/containerapp/tests/latest/recordings/test_containerapp_env_deprecate_arguments.yaml
diff --git a/...modules/containerapp/tests/latest/recordings/test_containerapp_env_internal_only_e2e.yaml b/...modules/containerapp/tests/latest/recordings/test_containerapp_env_internal_only_e2e.yaml
diff --git a/.../command_modules/containerapp/tests/latest/recordings/test_containerapp_env_logs_e2e.yaml b/.../command_modules/containerapp/tests/latest/recordings/test_containerapp_env_logs_e2e.yaml
diff --git a/...es/containerapp/tests/latest/recordings/test_containerapp_env_p2p_traffic_encryption.yaml b/...es/containerapp/tests/latest/recordings/test_containerapp_env_p2p_traffic_encryption.yaml
@@ -2041,7 +2041,7 @@ interactions:
 - request:
     body: '{"location": "eastus", "tags": null, "properties": {"daprAIInstrumentationKey":
       null, "vnetConfiguration": null, "appLogsConfiguration": {"destination": "log-analytics",
-      "logAnalyticsConfiguration": {"customerId": "b97084bf-1fcc-47fc-8ad6-d5ab05454f9d",
+      "logAnalyticsConfiguration": {"customerId": "veryFakedCustomerId==",
       "sharedKey":"abc123"}},
       "customDomainConfiguration": null, "workloadProfiles": [{"workloadProfileType":
       "Consumption", "Name": "Consumption"}], "zoneRedundant": false, "peerTrafficConfiguration":

diff --git a/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_env_storage.yaml b/...i/command_modules/containerapp/tests/latest/recordings/test_containerapp_env_storage.yaml
diff --git a/...les/containerapp/tests/latest/recordings/test_containerapp_env_update_custom_domains.yaml b/...les/containerapp/tests/latest/recordings/test_containerapp_env_update_custom_domains.yaml
diff --git a/.../containerapp/tests/latest/recordings/test_containerapp_env_workload_profiles_delete.yaml b/.../containerapp/tests/latest/recordings/test_containerapp_env_workload_profiles_delete.yaml
diff --git a/...erapp/tests/latest/recordings/test_containerapp_env_workload_profiles_list_supported.yaml b/...erapp/tests/latest/recordings/test_containerapp_env_workload_profiles_list_supported.yaml
@@ -13,7 +13,7 @@ interactions:
       ParameterSetName:
       - -l
       User-Agent:
-      - python/3.10.11 (Windows-10-10.0.22631-SP0) AZURECLI/2.61.0
+      - python/3.10.11 (Windows-10-10.0.22631-SP0) AZURECLI/2.64.0
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.App/locations/northeurope/availableManagedEnvironmentsWorkloadProfileTypes?api-version=2024-03-01
   response:
@@ -23,15 +23,15 @@ interactions:
       api-supported-versions:
       - 2022-06-01-preview, 2022-10-01, 2022-11-01-preview, 2023-04-01-preview, 2023-05-01,
         2023-05-02-preview, 2023-08-01-preview, 2023-11-02-preview, 2024-02-02-preview,
-        2024-03-01
+        2024-03-01, 2024-08-02-preview
       cache-control:
       - no-cache
       content-length:
       - '4250'
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 28 May 2024 08:02:44 GMT
+      - Mon, 14 Oct 2024 06:40:22 GMT
       expires:
       - '-1'
       pragma:
@@ -44,8 +44,10 @@ interactions:
       - CONFIG_NOCACHE
       x-content-type-options:
       - nosniff
+      x-ms-ratelimit-remaining-subscription-global-reads:
+      - '16499'
       x-msedge-ref:
-      - 'Ref A: A1D38802A8B4495AB655044B5B43456D Ref B: MAA201060515049 Ref C: 2024-05-28T08:02:44Z'
+      - 'Ref A: C94A271CFD584B4EAD2B79B7B9FFC6FC Ref B: MAA201060514045 Ref C: 2024-10-14T06:40:22Z'
       x-powered-by:
       - ASP.NET
     status:
@@ -65,7 +67,7 @@ interactions:
       ParameterSetName:
       - -l
       User-Agent:
-      - python/3.10.11 (Windows-10-10.0.22631-SP0) AZURECLI/2.61.0
+      - python/3.10.11 (Windows-10-10.0.22631-SP0) AZURECLI/2.64.0
     method: GET
     uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.App/locations/eastus/availableManagedEnvironmentsWorkloadProfileTypes?api-version=2024-03-01
   response:
@@ -75,15 +77,15 @@ interactions:
       api-supported-versions:
       - 2022-06-01-preview, 2022-10-01, 2022-11-01-preview, 2023-04-01-preview, 2023-05-01,
         2023-05-02-preview, 2023-08-01-preview, 2023-11-02-preview, 2024-02-02-preview,
-        2024-03-01
+        2024-03-01, 2024-08-02-preview
       cache-control:
       - no-cache
       content-length:
       - '3089'
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 28 May 2024 08:02:47 GMT
+      - Mon, 14 Oct 2024 06:40:25 GMT
       expires:
       - '-1'
       pragma:
@@ -96,8 +98,10 @@ interactions:
       - CONFIG_NOCACHE
       x-content-type-options:
       - nosniff
+      x-ms-ratelimit-remaining-subscription-global-reads:
+      - '16499'
       x-msedge-ref:
-      - 'Ref A: 13E0B71B8A254923B175C940E014E57F Ref B: MAA201060515045 Ref C: 2024-05-28T08:02:47Z'
+      - 'Ref A: 23ABC268A3F8488BA840FB1CEC8F29D6 Ref B: MAA201060515053 Ref C: 2024-10-14T06:40:25Z'
       x-powered-by:
       - ASP.NET
     status: