Skip to content

Upgrade Deployments commands to use latest SDK #31343

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

Closed
anthony-c-martin wants to merge 1 commit into from
Closed

Upgrade Deployments commands to use latest SDK #31343

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
5 changes: 4 additions & 1 deletion src/azure-cli-core/azure/cli/core/profiles/_shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli/azure/cli/command_modules/appservice/appservice_domains.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/network/_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/azure-cli/azure/cli/command_modules/network/azure_stack/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down
16 changes: 8 additions & 8 deletions src/azure-cli/azure/cli/command_modules/network/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli/azure/cli/command_modules/resource/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 `<principalId>:<roleDefinitionId>`")
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)
Expand Down
Loading
Loading