diff --git a/src/azure-cli-core/azure/cli/core/profiles/_shared.py b/src/azure-cli-core/azure/cli/core/profiles/_shared.py index d4d535f8952..8a02121e1bd 100644 --- a/src/azure-cli-core/azure/cli/core/profiles/_shared.py +++ b/src/azure-cli-core/azure/cli/core/profiles/_shared.py @@ -177,7 +177,10 @@ def default_api_version(self): ResourceType.MGMT_RESOURCE_POLICY: SDKProfile('2021-06-01', { 'policy_exemptions': '2020-07-01-preview' }), - ResourceType.MGMT_RESOURCE_RESOURCES: '2022-09-01', + ResourceType.MGMT_RESOURCE_RESOURCES: SDKProfile('2022-09-01', { + 'deployments': '2024-11-01', + 'deployment_operations': '2024-11-01', + }), ResourceType.MGMT_RESOURCE_SUBSCRIPTIONS: '2022-12-01', ResourceType.MGMT_RESOURCE_DEPLOYMENTSCRIPTS: '2020-10-01', ResourceType.MGMT_RESOURCE_TEMPLATESPECS: '2021-05-01', diff --git a/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py b/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py index 2114c1dcb25..b49ff56a051 100644 --- a/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py +++ b/src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py @@ -283,7 +283,7 @@ def ensure_default_log_analytics_workspace_for_monitoring( ) GenericResource = cmd.get_models( - "GenericResource", resource_type=ResourceType.MGMT_RESOURCE_RESOURCES + "GenericResource", resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group="resources" ) generic_resource = GenericResource( location=workspace_region, properties={"sku": {"name": "standalone"}} diff --git a/src/azure-cli/azure/cli/command_modules/appservice/appservice_domains.py b/src/azure-cli/azure/cli/command_modules/appservice/appservice_domains.py index 3f09853ad9b..22da19c87ba 100644 --- a/src/azure-cli/azure/cli/command_modules/appservice/appservice_domains.py +++ b/src/azure-cli/azure/cli/command_modules/appservice/appservice_domains.py @@ -140,9 +140,9 @@ def create_domain(cmd, resource_group_name, hostname, contact_info, privacy=True # deploy ARM template deployment_name = 'domain_deploy_' + random_string(32) client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES).deployments - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') properties = DeploymentProperties(template=template, parameters={}, mode='incremental') - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) deployment_result = DeploymentOutputLongRunningOperation(cmd.cli_ctx)( sdk_no_wait(no_wait, client.begin_create_or_update, resource_group_name, deployment_name, deployment)) diff --git a/src/azure-cli/azure/cli/command_modules/network/_validators.py b/src/azure-cli/azure/cli/command_modules/network/_validators.py index 28fb9e2684c..0d8cbba55e5 100644 --- a/src/azure-cli/azure/cli/command_modules/network/_validators.py +++ b/src/azure-cli/azure/cli/command_modules/network/_validators.py @@ -48,7 +48,7 @@ def get_vnet_validator(dest): from azure.mgmt.core.tools import is_valid_resource_id, resource_id def _validate_vnet_name_or_id(cmd, namespace): - SubResource = cmd.get_models('SubResource', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + SubResource = cmd.get_models('SubResource', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='resources') subscription_id = get_subscription_id(cmd.cli_ctx) resource_group = namespace.resource_group_name diff --git a/src/azure-cli/azure/cli/command_modules/network/azure_stack/custom.py b/src/azure-cli/azure/cli/command_modules/network/azure_stack/custom.py index 34fecefaf39..238ef25a366 100644 --- a/src/azure-cli/azure/cli/command_modules/network/azure_stack/custom.py +++ b/src/azure-cli/azure/cli/command_modules/network/azure_stack/custom.py @@ -790,7 +790,7 @@ def create_load_balancer(cmd, load_balancer_name, resource_group_name, location= from azure.cli.command_modules.network.azure_stack._template_builder import ( build_load_balancer_resource, build_public_ip_resource, build_vnet_resource) - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') if public_ip_address is None: logger.warning( @@ -854,7 +854,7 @@ def create_load_balancer(cmd, load_balancer_name, resource_group_name, location= deployment_name = 'lb_deploy_' + random_string(32) client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES).deployments properties = DeploymentProperties(template=template, parameters={}, mode='incremental') - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate: @@ -909,7 +909,7 @@ def create_vpn_connection(cmd, resource_group_name, connection_name, vnet_gatewa from azure.cli.core.commands.arm import ArmTemplateBuilder from azure.cli.command_modules.network.azure_stack._template_builder import build_vpn_connection_resource - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') tags = tags or {} # Build up the ARM template @@ -933,7 +933,7 @@ def create_vpn_connection(cmd, resource_group_name, connection_name, vnet_gatewa deployment_name = 'vpn_connection_deploy_' + random_string(32) client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES).deployments properties = DeploymentProperties(template=template, parameters=parameters, mode='incremental') - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate: diff --git a/src/azure-cli/azure/cli/command_modules/network/custom.py b/src/azure-cli/azure/cli/command_modules/network/custom.py index c09e34ce733..557b01ede2b 100644 --- a/src/azure-cli/azure/cli/command_modules/network/custom.py +++ b/src/azure-cli/azure/cli/command_modules/network/custom.py @@ -243,7 +243,7 @@ def create_application_gateway(cmd, application_gateway_name, resource_group_nam from azure.cli.command_modules.network._template_builder import ( build_application_gateway_resource, build_public_ip_resource, build_vnet_resource) - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') tags = tags or {} sku_tier = sku.split('_', 1)[0] if not _is_v2_sku(sku) else sku @@ -324,7 +324,7 @@ def create_application_gateway(cmd, application_gateway_name, resource_group_nam deployment_name = 'ag_deploy_' + random_string(32) client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES).deployments properties = DeploymentProperties(template=template, parameters=parameters, mode='incremental') - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate: @@ -3999,7 +3999,7 @@ def create_load_balancer(cmd, load_balancer_name, resource_group_name, location= from azure.cli.command_modules.network._template_builder import ( build_load_balancer_resource, build_public_ip_resource, build_vnet_resource) - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') aux_subscriptions = _get_lb_create_aux_subscriptions(public_ip_address, subnet) if public_ip_address is None: @@ -4067,7 +4067,7 @@ def create_load_balancer(cmd, load_balancer_name, resource_group_name, location= deployment_name = 'lb_deploy_' + random_string(32) client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES, aux_subscriptions=aux_subscriptions).deployments properties = DeploymentProperties(template=template, parameters={}, mode='incremental') - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate: @@ -4144,7 +4144,7 @@ def create_cross_region_load_balancer(cmd, load_balancer_name, resource_group_na from azure.cli.command_modules.network._template_builder import ( build_load_balancer_resource, build_public_ip_resource) - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') sku = 'standard' tier = 'Global' @@ -4188,7 +4188,7 @@ def create_cross_region_load_balancer(cmd, load_balancer_name, resource_group_na deployment_name = 'lb_deploy_' + random_string(32) client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES).deployments properties = DeploymentProperties(template=template, parameters={}, mode='incremental') - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate: @@ -6219,7 +6219,7 @@ def create_vpn_connection(cmd, resource_group_name, connection_name, vnet_gatewa from azure.cli.core.commands.arm import ArmTemplateBuilder from azure.cli.command_modules.network._template_builder import build_vpn_connection_resource - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') tags = tags or {} # Build up the ARM template @@ -6245,7 +6245,7 @@ def create_vpn_connection(cmd, resource_group_name, connection_name, vnet_gatewa deployment_name = 'vpn_connection_deploy_' + random_string(32) client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES, aux_subscriptions=aux_subscriptions).deployments properties = DeploymentProperties(template=template, parameters=parameters, mode='incremental') - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate: diff --git a/src/azure-cli/azure/cli/command_modules/resource/_params.py b/src/azure-cli/azure/cli/command_modules/resource/_params.py index b481519c2d7..2717a00e2ec 100644 --- a/src/azure-cli/azure/cli/command_modules/resource/_params.py +++ b/src/azure-cli/azure/cli/command_modules/resource/_params.py @@ -33,7 +33,7 @@ def load_arguments(self, _): ExemptionCategory = self.get_models('ExemptionCategory', resource_type=ResourceType.MGMT_RESOURCE_POLICY, operation_group='policy_exemptions') - DeploymentMode, WhatIfResultFormat, ChangeType = self.get_models('DeploymentMode', 'WhatIfResultFormat', 'ChangeType') + DeploymentMode, WhatIfResultFormat, ChangeType = self.get_models('DeploymentMode', 'WhatIfResultFormat', 'ChangeType', operation_group='deployments') # BASIC PARAMETER CONFIGURATION @@ -617,7 +617,7 @@ def load_arguments(self, _): c.argument('authorizations', options_list=['--authorizations', '-a'], nargs='+', help="space-separated authorization pairs in a format of `:`") c.argument('create_ui_definition', options_list=['--create-ui-definition', '-c'], help='JSON formatted string or a path to a file with such content', type=file_type) c.argument('main_template', options_list=['--main-template', '-t'], help='JSON formatted string or a path to a file with such content', type=file_type) - c.argument('deployment_mode', arg_type=get_enum_type(self.get_models('DeploymentMode')), help='The managed application deployment mode.') + c.argument('deployment_mode', arg_type=get_enum_type(self.get_models('DeploymentMode', operation_group='deployments')), help='The managed application deployment mode.', operation_group='deployments') with self.argument_context('account') as c: c.argument('subscription', options_list=['--subscription', '-s'], help='Name or ID of subscription.', completer=get_subscription_id_list) diff --git a/src/azure-cli/azure/cli/command_modules/resource/custom.py b/src/azure-cli/azure/cli/command_modules/resource/custom.py index 70d58271224..fd976dfd9a8 100644 --- a/src/azure-cli/azure/cli/command_modules/resource/custom.py +++ b/src/azure-cli/azure/cli/command_modules/resource/custom.py @@ -378,7 +378,7 @@ def _deploy_arm_template_core_unmodified(cmd, resource_group_name, template_file mode=None, rollback_on_error=None, validate_only=False, no_wait=False, aux_subscriptions=None, aux_tenants=None, no_prompt=False): DeploymentProperties, TemplateLink, OnErrorDeployment = cmd.get_models('DeploymentProperties', 'TemplateLink', - 'OnErrorDeployment') + 'OnErrorDeployment', operation_group='deployments') template_link = None template_obj = None on_error_deployment = None @@ -425,7 +425,7 @@ def _deploy_arm_template_core_unmodified(cmd, resource_group_name, template_file ) from azure.core.exceptions import HttpResponseError - Deployment = cmd.get_models('Deployment') + Deployment = cmd.get_models('Deployment', operation_group='deployments') deployment = Deployment(properties=properties) if cmd.supported_api_version(min_api='2019-10-01', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES): try: @@ -509,7 +509,7 @@ def deploy_arm_template_at_subscription_scope(cmd, if what_if: return None - ChangeType = cmd.get_models('ChangeType') + ChangeType = cmd.get_models('ChangeType', operation_group='deployments') has_change = any(change.change_type not in [ChangeType.no_change, ChangeType.ignore] for change in what_if_result.changes) if not proceed_if_no_change or has_change: @@ -551,7 +551,7 @@ def _deploy_arm_template_at_subscription_scope(cmd, mgmt_client = _get_deployment_management_client(cmd.cli_ctx, plug_pipeline=(template_uri is None and template_spec is None)) from azure.core.exceptions import HttpResponseError - Deployment = cmd.get_models('Deployment') + Deployment = cmd.get_models('Deployment', operation_group='deployments') deployment = Deployment(properties=deployment_properties, location=deployment_location) if cmd.supported_api_version(min_api='2019-10-01', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES): try: @@ -594,7 +594,7 @@ def deploy_arm_template_at_resource_group(cmd, if what_if: return None - ChangeType = cmd.get_models('ChangeType') + ChangeType = cmd.get_models('ChangeType', operation_group='deployments') has_change = any(change.change_type not in [ChangeType.no_change, ChangeType.ignore] for change in what_if_result.changes) if not proceed_if_no_change or has_change: @@ -642,7 +642,7 @@ def _deploy_arm_template_at_resource_group(cmd, aux_tenants=aux_tenants, plug_pipeline=deployment_properties.template_link is None) from azure.core.exceptions import HttpResponseError - Deployment = cmd.get_models('Deployment') + Deployment = cmd.get_models('Deployment', operation_group='deployments') deployment = Deployment(properties=deployment_properties) if cmd.supported_api_version(min_api='2019-10-01', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES): try: @@ -685,7 +685,7 @@ def deploy_arm_template_at_management_group(cmd, if what_if: return None - ChangeType = cmd.get_models('ChangeType') + ChangeType = cmd.get_models('ChangeType', operation_group='deployments') has_change = any(change.change_type not in [ChangeType.no_change, ChangeType.ignore] for change in what_if_result.changes) if not proceed_if_no_change or has_change: @@ -733,7 +733,7 @@ def _deploy_arm_template_at_management_group(cmd, mgmt_client = _get_deployment_management_client(cmd.cli_ctx, plug_pipeline=deployment_properties.template_link is None) from azure.core.exceptions import HttpResponseError - ScopedDeployment = cmd.get_models('ScopedDeployment') + ScopedDeployment = cmd.get_models('ScopedDeployment', operation_group='deployments') deployment = ScopedDeployment(properties=deployment_properties, location=deployment_location) if cmd.supported_api_version(min_api='2019-10-01', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES): try: @@ -777,7 +777,7 @@ def deploy_arm_template_at_tenant_scope(cmd, if what_if: return None - ChangeType = cmd.get_models('ChangeType') + ChangeType = cmd.get_models('ChangeType', operation_group='deployments') has_change = any(change.change_type not in [ChangeType.no_change, ChangeType.ignore] for change in what_if_result.changes) if not proceed_if_no_change or has_change: @@ -817,7 +817,7 @@ def _deploy_arm_template_at_tenant_scope(cmd, mgmt_client = _get_deployment_management_client(cmd.cli_ctx, plug_pipeline=deployment_properties.template_link is None) from azure.core.exceptions import HttpResponseError - ScopedDeployment = cmd.get_models('ScopedDeployment') + ScopedDeployment = cmd.get_models('ScopedDeployment', operation_group='deployments') deployment = ScopedDeployment(properties=deployment_properties, location=deployment_location) if cmd.supported_api_version(min_api='2019-10-01', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES): try: @@ -865,7 +865,7 @@ def _what_if_deploy_arm_template_at_resource_group_core(cmd, resource_group_name parameters, mode, result_format, no_prompt, template_spec, query_string) mgmt_client = _get_deployment_management_client(cmd.cli_ctx, aux_tenants=aux_tenants, plug_pipeline=what_if_properties.template_link is None) - DeploymentWhatIf = cmd.get_models('DeploymentWhatIf') + DeploymentWhatIf = cmd.get_models('DeploymentWhatIf', operation_group='deployments') deployment_what_if = DeploymentWhatIf(properties=what_if_properties) what_if_poller = mgmt_client.begin_what_if(resource_group_name, deployment_name, parameters=deployment_what_if) @@ -895,7 +895,7 @@ def _what_if_deploy_arm_template_at_subscription_scope_core(cmd, what_if_properties = _prepare_deployment_what_if_properties(cmd, 'subscription', template_file, template_uri, parameters, DeploymentMode.incremental, result_format, no_prompt, template_spec, query_string) mgmt_client = _get_deployment_management_client(cmd.cli_ctx, plug_pipeline=what_if_properties.template_link is None) - ScopedDeploymentWhatIf = cmd.get_models('ScopedDeploymentWhatIf') + ScopedDeploymentWhatIf = cmd.get_models('ScopedDeploymentWhatIf', operation_group='deployments') scoped_deployment_what_if = ScopedDeploymentWhatIf(location=deployment_location, properties=what_if_properties) what_if_poller = mgmt_client.begin_what_if_at_subscription_scope(deployment_name, parameters=scoped_deployment_what_if) @@ -925,7 +925,7 @@ def _what_if_deploy_arm_template_at_management_group_core(cmd, management_group_ what_if_properties = _prepare_deployment_what_if_properties(cmd, 'managementGroup', template_file, template_uri, parameters, DeploymentMode.incremental, result_format, no_prompt, template_spec=template_spec, query_string=query_string) mgmt_client = _get_deployment_management_client(cmd.cli_ctx, plug_pipeline=what_if_properties.template_link is None) - ScopedDeploymentWhatIf = cmd.get_models('ScopedDeploymentWhatIf') + ScopedDeploymentWhatIf = cmd.get_models('ScopedDeploymentWhatIf', operation_group='deployments') scoped_deployment_what_if = ScopedDeploymentWhatIf(location=deployment_location, properties=what_if_properties) what_if_poller = mgmt_client.begin_what_if_at_management_group_scope(management_group_id, deployment_name, parameters=scoped_deployment_what_if) @@ -955,7 +955,7 @@ def _what_if_deploy_arm_template_at_tenant_scope_core(cmd, what_if_properties = _prepare_deployment_what_if_properties(cmd, 'tenant', template_file, template_uri, parameters, DeploymentMode.incremental, result_format, no_prompt, template_spec, query_string) mgmt_client = _get_deployment_management_client(cmd.cli_ctx, plug_pipeline=what_if_properties.template_link is None) - ScopedDeploymentWhatIf = cmd.get_models('ScopedDeploymentWhatIf') + ScopedDeploymentWhatIf = cmd.get_models('ScopedDeploymentWhatIf', operation_group='deployments') scoped_deployment_what_if = ScopedDeploymentWhatIf(location=deployment_location, properties=what_if_properties) what_if_poller = mgmt_client.begin_what_if_at_tenant_scope(deployment_name, parameters=scoped_deployment_what_if) what_if_result = _what_if_deploy_arm_template_core(cmd.cli_ctx, what_if_poller, no_pretty_print, exclude_change_types) @@ -1110,7 +1110,7 @@ def _load_template_spec_template(cmd, template_spec): def _prepare_deployment_properties_unmodified(cmd, deployment_scope, template_file=None, template_uri=None, parameters=None, mode=None, rollback_on_error=None, no_prompt=False, template_spec=None, query_string=None): - DeploymentProperties, TemplateLink, OnErrorDeployment = cmd.get_models('DeploymentProperties', 'TemplateLink', 'OnErrorDeployment') + DeploymentProperties, TemplateLink, OnErrorDeployment = cmd.get_models('DeploymentProperties', 'TemplateLink', 'OnErrorDeployment', operation_group='deployments') if template_file: pass @@ -1319,7 +1319,7 @@ def _prepare_stacks_templates_and_parameters(cmd, rcf, deployment_scope, deploym t_spec, t_uri = None, None template_obj = None - DeploymentStacksTemplateLink = cmd.get_models('DeploymentStacksTemplateLink') + DeploymentStacksTemplateLink = cmd.get_models('DeploymentStacksTemplateLink', operation_group='deployments') if template_file: pass @@ -1646,7 +1646,7 @@ def create_resource_group(cmd, rg_name, location, tags=None, managed_by=None): """ rcf = _resource_client_factory(cmd.cli_ctx) - ResourceGroup = cmd.get_models('ResourceGroup') + ResourceGroup = cmd.get_models('ResourceGroup', operation_group='resource_groups') parameters = ResourceGroup( location=location, tags=tags @@ -1700,7 +1700,7 @@ def export_group_as_template( options = ','.join(export_options) if export_options else None - ExportTemplateRequest = cmd.get_models('ExportTemplateRequest') + ExportTemplateRequest = cmd.get_models('ExportTemplateRequest', operation_group='deployments') export_template_request = ExportTemplateRequest(resources=resources, options=options) # Exporting a resource group as a template is async since API version 2019-08-01. @@ -3101,7 +3101,7 @@ def list_resources(cmd, resource_group_name=None, def register_provider(cmd, resource_provider_namespace, consent_to_permissions=False, mg=None, wait=False, accept_terms=None): properties = None if cmd.supported_api_version(min_api='2021-04-01') and consent_to_permissions: - ProviderRegistrationRequest, ProviderConsentDefinition = cmd.get_models('ProviderRegistrationRequest', 'ProviderConsentDefinition') + ProviderRegistrationRequest, ProviderConsentDefinition = cmd.get_models('ProviderRegistrationRequest', 'ProviderConsentDefinition', operation_group='providers') properties = ProviderRegistrationRequest(third_party_provider_consent=ProviderConsentDefinition(consent_to_authorization=consent_to_permissions)) _update_provider(cmd, resource_provider_namespace, registering=True, wait=wait, properties=properties, mg_id=mg, accept_terms=accept_terms) @@ -3153,7 +3153,7 @@ def move_resource(cmd, ids, destination_group, destination_subscription_id=None) target = _build_resource_id(subscription=(destination_subscription_id or default_subscription_id), resource_group=destination_group) - ResourcesMoveInfo = cmd.get_models('ResourcesMoveInfo') + ResourcesMoveInfo = cmd.get_models('ResourcesMoveInfo', operation_group='resources') resources_move_info = ResourcesMoveInfo(resources=ids, target_resource_group=target) return rcf.resources.begin_move_resources(resources[0]['resource_group'], parameters=resources_move_info) @@ -4301,9 +4301,9 @@ def create_or_update_tag_at_scope(cmd, resource_id=None, tags=None, tag_name=Non if resource_id is not None: if not tags: raise IncorrectUsageError("Tags could not be empty.") - Tags = cmd.get_models('Tags') + Tags = cmd.get_models('Tags', operation_group='tags') tag_obj = Tags(tags=tags) - TagsResource = cmd.get_models('TagsResource') + TagsResource = cmd.get_models('TagsResource', operation_group='tags') tags_resource = TagsResource(properties=tag_obj) return rcf.tags.begin_create_or_update_at_scope(scope=resource_id, parameters=tags_resource) @@ -4322,9 +4322,9 @@ def update_tag_at_scope(cmd, resource_id, tags, operation): rcf = _resource_client_factory(cmd.cli_ctx) if not tags: raise IncorrectUsageError("Tags could not be empty.") - Tags = cmd.get_models('Tags') + Tags = cmd.get_models('Tags', operation_group='tags') tag_obj = Tags(tags=tags) - TagsPatchResource = cmd.get_models('TagsPatchResource') + TagsPatchResource = cmd.get_models('TagsPatchResource', operation_group='tags') tags_resource = TagsPatchResource(properties=tag_obj, operation=operation) return rcf.tags.begin_update_at_scope(scope=resource_id, parameters=tags_resource) # endregion diff --git a/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_custom.py b/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_custom.py index 0ba7e232caf..57eeca78452 100644 --- a/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_custom.py +++ b/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_custom.py @@ -46,7 +46,8 @@ cmd.cli_ctx = cli_ctx WhatIfOperationResult, WhatIfChange, ChangeType = cmd.get_models( - 'WhatIfOperationResult', 'WhatIfChange', 'ChangeType' + 'WhatIfOperationResult', 'WhatIfChange', 'ChangeType', + operation_group='deployments' ) def _simulate_no_tty(): diff --git a/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_formatters.py b/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_formatters.py index e5ae89267b3..dc85222cf08 100644 --- a/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_formatters.py +++ b/src/azure-cli/azure/cli/command_modules/resource/tests/latest/test_resource_formatters.py @@ -20,6 +20,7 @@ WhatIfOperationResult, WhatIfChange, WhatIfPropertyChange, ChangeType, PropertyChangeType = cmd.get_models( "WhatIfOperationResult", "WhatIfChange", "WhatIfPropertyChange", "ChangeType", "PropertyChangeType", + operation_group='deployments' ) diff --git a/src/azure-cli/azure/cli/command_modules/servicefabric/_arm_deployment_utils.py b/src/azure-cli/azure/cli/command_modules/servicefabric/_arm_deployment_utils.py index b36264be81a..69f412e45e4 100644 --- a/src/azure-cli/azure/cli/command_modules/servicefabric/_arm_deployment_utils.py +++ b/src/azure-cli/azure/cli/command_modules/servicefabric/_arm_deployment_utils.py @@ -38,11 +38,11 @@ def _deploy_arm_template_core(cmd, mode='incremental', validate_only=False, no_wait=False): - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') properties = DeploymentProperties( template=template, template_link=None, parameters=parameters, mode=mode) client = resource_client_factory(cmd.cli_ctx) - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate_only: diff --git a/src/azure-cli/azure/cli/command_modules/servicefabric/custom.py b/src/azure-cli/azure/cli/command_modules/servicefabric/custom.py index a4511e2a663..e836e47921e 100644 --- a/src/azure-cli/azure/cli/command_modules/servicefabric/custom.py +++ b/src/azure-cli/azure/cli/command_modules/servicefabric/custom.py @@ -1281,11 +1281,11 @@ def _deploy_arm_template_core(cmd, mode='incremental', validate_only=False, no_wait=False): - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') properties = DeploymentProperties( template=template, template_link=None, parameters=parameters, mode=mode) client = resource_client_factory(cmd.cli_ctx) - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate_only: diff --git a/src/azure-cli/azure/cli/command_modules/vm/azure_stack/custom.py b/src/azure-cli/azure/cli/command_modules/vm/azure_stack/custom.py index c3690122aca..97aa67750a5 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/azure_stack/custom.py +++ b/src/azure-cli/azure/cli/command_modules/vm/azure_stack/custom.py @@ -1087,9 +1087,9 @@ def create_vm(cmd, vm_name, resource_group_name, image=None, size='Standard_DS1_ deployment_name = 'vm_deploy_' + random_string(32) client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES, aux_subscriptions=aux_subscriptions).deployments - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') properties = DeploymentProperties(template=template, parameters=parameters, mode='incremental') - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate: @@ -1737,9 +1737,9 @@ def create_av_set(cmd, availability_set_name, resource_group_name, platform_faul # deploy ARM template deployment_name = 'av_set_deploy_' + random_string(32) client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES).deployments - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') properties = DeploymentProperties(template=template, parameters={}, mode='incremental') - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate: @@ -3464,7 +3464,7 @@ def _get_public_ip_address_allocation(value, sku): client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES, aux_subscriptions=aux_subscriptions).deployments - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') properties = DeploymentProperties(template=template, parameters=parameters, mode='incremental') if validate: @@ -3472,7 +3472,7 @@ def _get_public_ip_address_allocation(value, sku): log_pprint_template(template) log_pprint_template(parameters) - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate: if cmd.supported_api_version(min_api='2019-10-01', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES): diff --git a/src/azure-cli/azure/cli/command_modules/vm/custom.py b/src/azure-cli/azure/cli/command_modules/vm/custom.py index 20b3ed1b0ae..06958dbae28 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/custom.py +++ b/src/azure-cli/azure/cli/command_modules/vm/custom.py @@ -1139,9 +1139,9 @@ def create_vm(cmd, vm_name, resource_group_name, image=None, size='Standard_DS1_ deployment_name = 'vm_deploy_' + random_string(32) client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES, aux_subscriptions=aux_subscriptions).deployments - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') properties = DeploymentProperties(template=template, parameters=parameters, mode='incremental') - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate: @@ -1857,9 +1857,9 @@ def create_av_set(cmd, availability_set_name, resource_group_name, platform_faul # deploy ARM template deployment_name = 'av_set_deploy_' + random_string(32) client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES).deployments - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') properties = DeploymentProperties(template=template, parameters={}, mode='incremental') - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate: @@ -3626,7 +3626,7 @@ def _get_public_ip_address_allocation(value, sku): client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES, aux_subscriptions=aux_subscriptions).deployments - DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + DeploymentProperties = cmd.get_models('DeploymentProperties', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') properties = DeploymentProperties(template=template, parameters=parameters, mode='incremental') if validate: @@ -3634,7 +3634,7 @@ def _get_public_ip_address_allocation(value, sku): log_pprint_template(template) log_pprint_template(parameters) - Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES) + Deployment = cmd.get_models('Deployment', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES, operation_group='deployments') deployment = Deployment(properties=properties) if validate: if cmd.supported_api_version(min_api='2019-10-01', resource_type=ResourceType.MGMT_RESOURCE_RESOURCES): diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index 8fa1ce9bb43..e7b13d8fc3f 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -65,7 +65,7 @@ azure-mgmt-recoveryservices==3.0.0 azure-mgmt-recoveryservicesbackup==9.1.0 azure-mgmt-redhatopenshift==1.5.0 azure-mgmt-redis==14.5.0 -azure-mgmt-resource==23.1.1 +azure-mgmt-resource==23.3.0 azure-mgmt-search==9.0.0 azure-mgmt-security==6.0.0 azure-mgmt-servicebus==8.2.0 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index 6258085564d..26631aaa985 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -65,7 +65,7 @@ azure-mgmt-recoveryservices==3.0.0 azure-mgmt-recoveryservicesbackup==9.1.0 azure-mgmt-redhatopenshift==1.5.0 azure-mgmt-redis==14.5.0 -azure-mgmt-resource==23.1.1 +azure-mgmt-resource==23.3.0 azure-mgmt-search==9.0.0 azure-mgmt-security==6.0.0 azure-mgmt-servicebus==8.2.0 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index e83330ba201..270865e4172 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -65,7 +65,7 @@ azure-mgmt-recoveryservices==3.0.0 azure-mgmt-recoveryservicesbackup==9.1.0 azure-mgmt-redhatopenshift==1.5.0 azure-mgmt-redis==14.5.0 -azure-mgmt-resource==23.1.1 +azure-mgmt-resource==23.3.0 azure-mgmt-search==9.0.0 azure-mgmt-security==6.0.0 azure-mgmt-servicebus==8.2.0 diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index f160e684880..f16fcb4d4f2 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -108,7 +108,7 @@ 'azure-mgmt-recoveryservices~=3.0.0', 'azure-mgmt-redhatopenshift~=1.5.0', 'azure-mgmt-redis~=14.5.0', - 'azure-mgmt-resource==23.1.1', + 'azure-mgmt-resource==23.3.0', 'azure-mgmt-search~=9.0', 'azure-mgmt-security==6.0.0', 'azure-mgmt-servicebus~=8.2.0',