[ARM] Deployment Stacks initial 2025-07-01 API version support

src/azure-cli/azure/cli/command_modules/network/operations/watcher.py

@@ -570,7 +570,6 @@ def process_nw_cm_v2_create_namespace(cmd):
     validate_tags(args)
     if not has_value(args.location):  # location is None only occurs in creating a V2 connection monitor
         endpoint_source_resource_id = args.endpoint_source_resource_id.to_serialized_data()
-        from azure.mgmt.resource import ResourceManagementClient
         # parse and verify endpoint_source_resource_id
         if not has_value(args.endpoint_source_resource_id):
             raise ValidationError('usage error: --location/--endpoint-source-resource-id '
@@ -579,7 +578,7 @@ def process_nw_cm_v2_create_namespace(cmd):
             raise ValidationError('usage error: "{}" is not a valid resource id'.format(endpoint_source_resource_id))
 
         resource = parse_resource_id(endpoint_source_resource_id)
-        resource_client = get_mgmt_service_client(cmd.cli_ctx, ResourceManagementClient)
+        resource_client = get_mgmt_service_client(cmd.cli_ctx, ResourceType.MGMT_RESOURCE_RESOURCES)
         resource_api_version = _resolve_api_version(resource_client,
                                                     resource['namespace'],
                                                     resource['resource_parent'],

src/azure-cli/azure/cli/command_modules/resource/_client_factory.py

@@ -40,10 +40,11 @@ def _resource_deployments_client_factory(cli_ctx, **_):
     return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_DEPLOYMENTS)
 
 
-def _resource_deploymentscripts_client_factory(cli_ctx, **_):
+def _resource_deploymentscripts_client_factory(cli_ctx, api_version=None, **_):
     from azure.cli.core.commands.client_factory import get_mgmt_service_client
     from azure.cli.core.profiles import ResourceType
-    return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_DEPLOYMENTSCRIPTS)
+    kwargs = {'api_version': api_version or '2023-08-01'}
+    return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_DEPLOYMENTSCRIPTS, **kwargs)
 
 
 def _authorization_management_client(cli_ctx, **_):
@@ -64,10 +65,12 @@ def _resource_managementgroups_client_factory(cli_ctx, **_):
     return get_mgmt_service_client(cli_ctx, ManagementGroupsAPI, subscription_bound=False)
 
 
-def _resource_templatespecs_client_factory(cli_ctx, subscription_id=None, **_):
+def _resource_templatespecs_client_factory(cli_ctx, subscription_id=None, api_version=None, **_):
     from azure.cli.core.commands.client_factory import get_mgmt_service_client
     from azure.cli.core.profiles import ResourceType
-    kwargs = {'subscription_id': subscription_id} if subscription_id is not None else {}
+    kwargs = {'api_version': api_version or '2022-02-01'}
+    if subscription_id is not None:
+        kwargs['subscription_id'] = subscription_id
     return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_RESOURCE_TEMPLATESPECS, **kwargs)
 
 

src/azure-cli/azure/cli/command_modules/resource/_validators.py

@@ -272,3 +272,15 @@ def validate_msi(cmd, namespace, from_identity_command=False):
 class RollbackAction(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
         setattr(namespace, 'rollback_on_error', '' if not values else values)
+
+
+def iso_8601_duration(value):
+    """Validate the correct format of a timespan string and deserialize."""
+    from msrest.serialization import Deserializer
+    from msrest.exceptions import DeserializationError
+    try:
+        duration_obj = Deserializer.deserialize_duration(value)
+    except DeserializationError:
+        message = "Argument {} is not in a valid ISO-8601 duration format"
+        raise ValueError(message.format(value))
+    return duration_obj

src/azure-cli/azure/cli/command_modules/resource/commands.py

@@ -442,6 +442,16 @@ def load_command_table(self, _):
             'validate', 'validate_deployment_stack_at_management_group', validator=validate_deployment_stack_files,
             exception_handler=handle_template_based_exception)
 
+    # TODO(kylealbert): not ready for march 2026
+    # with self.command_group('stack-whatif mg', resource_deploymentstacks_sdk, resource_type=ResourceType.MGMT_RESOURCE_DEPLOYMENTSTACKS) as g:
+    #     g.custom_show_command('show', 'show_deployment_stack_what_if_at_management_group', table_transformer=transform_stacks)
+    #     g.custom_command('list', 'list_deployment_stack_what_if_at_management_group', table_transformer=transform_stacks_list)
+    #     g.custom_command('delete', 'delete_deployment_stack_what_if_at_management_group')
+    #     g.custom_command(
+    #         'create', 'create_deployment_stack_what_if_at_management_group', supports_no_wait=True,
+    #         validator=validate_deployment_stack_files, table_transformer=transform_stacks,
+    #         exception_handler=handle_template_based_exception)
+
     with self.command_group('stack sub', resource_deploymentstacks_sdk, resource_type=ResourceType.MGMT_RESOURCE_DEPLOYMENTSTACKS) as g:
         g.custom_show_command('show', 'show_deployment_stack_at_subscription', table_transformer=transform_stacks)
         g.custom_command('list', 'list_deployment_stack_at_subscription', table_transformer=transform_stacks_list)
@@ -454,6 +464,15 @@ def load_command_table(self, _):
             'validate', 'validate_deployment_stack_at_subscription', validator=validate_deployment_stack_files,
             exception_handler=handle_template_based_exception)
 
+    # TODO(kylealbert): not ready for march 2026
+    # with self.command_group('stack-whatif sub', resource_deploymentstacks_sdk, resource_type=ResourceType.MGMT_RESOURCE_DEPLOYMENTSTACKS) as g:
+    #     g.custom_show_command('show', 'show_deployment_stack_what_if_at_subscription', table_transformer=transform_stacks)
+    #     g.custom_command('list', 'list_deployment_stack_what_if_at_subscription', table_transformer=transform_stacks_list)
+    #     g.custom_command('delete', 'delete_deployment_stack_what_if_at_subscription')
+    #     g.custom_command(
+    #         'create', 'create_deployment_stack_what_if_at_subscription', supports_no_wait=True, validator=validate_deployment_stack_files,
+    #         table_transformer=transform_stacks, exception_handler=handle_template_based_exception)
+
     with self.command_group('stack group', resource_deploymentstacks_sdk, resource_type=ResourceType.MGMT_RESOURCE_DEPLOYMENTSTACKS) as g:
         g.custom_show_command('show', 'show_deployment_stack_at_resource_group', table_transformer=transform_stacks)
         g.custom_command('list', 'list_deployment_stack_at_resource_group', table_transformer=transform_stacks_list)
@@ -466,6 +485,15 @@ def load_command_table(self, _):
             'validate', 'validate_deployment_stack_at_resource_group', validator=validate_deployment_stack_files,
             exception_handler=handle_template_based_exception)
 
+    # TODO(kylealbert): not ready for march 2026
+    # with self.command_group('stack-whatif group', resource_deploymentstacks_sdk, resource_type=ResourceType.MGMT_RESOURCE_DEPLOYMENTSTACKS) as g:
+    #     g.custom_show_command('show', 'show_deployment_stack_what_if_at_resource_group', table_transformer=transform_stacks)
+    #     g.custom_command('list', 'list_deployment_stack_what_if_at_resource_group', table_transformer=transform_stacks_list)
+    #     g.custom_command('delete', 'delete_deployment_stack_what_if_at_resource_group')
+    #     g.custom_command(
+    #         'create', 'create_deployment_stack_what_if_at_resource_group', supports_no_wait=True, validator=validate_deployment_stack_files,
+    #         table_transformer=transform_stacks, exception_handler=handle_template_based_exception)
+
     # az deployment group
     with self.command_group('deployment group', resource_deployment_sdk, resource_type=ResourceType.MGMT_RESOURCE_DEPLOYMENTS) as g:
         g.custom_command('list', 'list_deployments_at_resource_group', table_transformer=transform_deployments_list)