diff --git a/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/addonput.py b/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/addonput.py index 39040dc9b14..76b21b3d143 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/addonput.py +++ b/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/addonput.py @@ -22,6 +22,7 @@ def addon_put(cmd, cluster_subscription, cluster_resource_group_name, cluster_na if getattr(mc.azure_monitor_profile.metrics, "enabled", None) is False: mc.azure_monitor_profile.metrics.enabled = True try: - client.begin_create_or_update(cluster_resource_group_name, cluster_name, mc) + poller = client.begin_create_or_update(cluster_resource_group_name, cluster_name, mc) + poller.result() except Exception as e: raise UnknownError(e) diff --git a/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/amg/link.py b/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/amg/link.py index 53ea95c05d4..44da7508edd 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/amg/link.py +++ b/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/amg/link.py @@ -69,11 +69,12 @@ def link_grafana_instance(cmd, raw_parameters, azure_monitor_workspace_resource_ } } try: - resources.begin_create_or_update_by_id( + poller = resources.begin_create_or_update_by_id( roleAssignmentResourceId, GRAFANA_ROLE_ASSIGNMENT_API, association_body ) + poller.result() except HttpResponseError as e: # If already exists (RoleAssignmentExists), warn and continue, else print error if e.error and e.error.code == "RoleAssignmentExists": @@ -109,11 +110,12 @@ def link_grafana_instance(cmd, raw_parameters, azure_monitor_workspace_resource_ targetGrafanaArmPayload["properties"]["grafanaIntegrations"]["azureMonitorWorkspaceIntegrations"].append({ "azureMonitorWorkspaceResourceId": azure_monitor_workspace_resource_id }) - resources.begin_create_or_update_by_id( + poller = resources.begin_create_or_update_by_id( grafana_resource_id, GRAFANA_API, targetGrafanaArmPayload ) + poller.result() except CLIError as e: raise CLIError(e) return GrafanaLink.SUCCESS diff --git a/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/amw/create.py b/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/amw/create.py index 42d66ff3897..0efb01b8a84 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/amw/create.py +++ b/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/amw/create.py @@ -34,7 +34,7 @@ def create_default_mac(cmd, cluster_subscription, cluster_region): else: resource_groups.create_or_update(default_resource_group_name, {"location": default_mac_region}) try: - resources.begin_create_or_update_by_id( + poller = resources.begin_create_or_update_by_id( azure_monitor_workspace_resource_id, MAC_API, { @@ -42,6 +42,7 @@ def create_default_mac(cmd, cluster_subscription, cluster_region): "properties": {} } ) + poller.result() return azure_monitor_workspace_resource_id, default_mac_region except Exception as e: raise CLIError(e) diff --git a/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/dc/dce_api.py b/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/dc/dce_api.py index be05f7ac1c0..6f2b6e36ce3 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/dc/dce_api.py +++ b/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/dc/dce_api.py @@ -20,7 +20,7 @@ def create_dce(cmd, cluster_subscription, cluster_resource_group_name, cluster_n from azure.cli.command_modules.acs._client_factory import get_resources_client resources = get_resources_client(cmd.cli_ctx, cluster_subscription) try: - resources.begin_create_or_update_by_id( + poller = resources.begin_create_or_update_by_id( dce_resource_id, DC_API, { @@ -30,6 +30,7 @@ def create_dce(cmd, cluster_subscription, cluster_resource_group_name, cluster_n "properties": {} } ) + poller.result() return dce_resource_id except Exception as error: raise CLIError(error) diff --git a/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/dc/dcr_api.py b/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/dc/dcr_api.py index 631fd477f2c..2e7555b7cee 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/dc/dcr_api.py +++ b/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/dc/dcr_api.py @@ -33,11 +33,12 @@ def create_dcr(cmd, mac_region, azure_monitor_workspace_resource_id, cluster_sub } } try: - resources.begin_create_or_update_by_id( + poller = resources.begin_create_or_update_by_id( dcr_resource_id, DC_API, dcr_creation_body ) + poller.result() return dcr_resource_id except Exception as error: raise CLIError(error) diff --git a/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/dc/dcra_api.py b/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/dc/dcra_api.py index 04603323d7f..e30ca8f02e3 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/dc/dcra_api.py +++ b/src/azure-cli/azure/cli/command_modules/acs/azuremonitormetrics/dc/dcra_api.py @@ -31,11 +31,12 @@ def create_dcra(cmd, cluster_region, cluster_subscription, cluster_resource_grou from azure.cli.command_modules.acs._client_factory import get_resources_client resources = get_resources_client(cmd.cli_ctx, cluster_subscription) try: - resources.begin_create_or_update_by_id( + poller = resources.begin_create_or_update_by_id( f"{cluster_resource_id}/providers/Microsoft.Insights/dataCollectionRuleAssociations/{dcra_name}", DC_API, association_body ) + poller.result() return dcra_resource_id except Exception as error: raise CLIError(error)