Merge branch 'dev' into wzl/add-what-if

Author: wangzelin007

.github/policies/resourceManagement.yml

@@ -1955,6 +1955,9 @@ configuration:
             mentionees:
             - ambhatna
             - deepthiprasad
+            - akning-ms
+            - junsu-msft
+            - coffeemug
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2295,6 +2298,9 @@ configuration:
             mentionees:
             - ambhatna
             - deepthiprasad
+            - akning-ms
+            - junsu-msft
+            - coffeemug
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -2308,6 +2314,9 @@ configuration:
             - daeunyim
             - rajsell
             - deepthiprasad
+            - akning-ms
+            - junsu-msft
+            - coffeemug
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:

src/azure-cli-core/azure/cli/core/breaking_change.py

@@ -266,7 +266,7 @@ def register(self, cli_ctx):
                 if not arg:
                     continue
                 arg.deprecate_info = self.appended_status_tag(cli_ctx, arg.deprecate_info, self.to_tag(cli_ctx))
-                arg.action = _argument_breaking_change_action(cli_ctx, arg.deprecate_info, arg.options['action'])
+                arg.action = _argument_breaking_change_action(cli_ctx, arg.deprecate_info, arg.options.get('action'))
         elif self.is_command_group(cli_ctx):
             command_group = cli_ctx.invocation.commands_loader.command_group_table[self.command_name]
             if not command_group:

src/azure-cli-core/azure/cli/core/profiles/_shared.py

@@ -214,9 +214,9 @@ def default_api_version(self):
         ResourceType.MGMT_MONITOR: None,
         ResourceType.MGMT_MSI: '2023-01-31',
         ResourceType.MGMT_APPSERVICE: '2024-11-01',
-        ResourceType.MGMT_IOTHUB: '2023-06-30-preview',
-        ResourceType.MGMT_IOTDPS: '2021-10-15',
-        ResourceType.MGMT_IOTCENTRAL: '2021-11-01-preview',
+        ResourceType.MGMT_IOTHUB: None,
+        ResourceType.MGMT_IOTDPS: None,
+        ResourceType.MGMT_IOTCENTRAL: None,
         ResourceType.MGMT_ARO: '2023-11-22',
         ResourceType.MGMT_DATABOXEDGE: '2021-02-01-preview',
         ResourceType.MGMT_CUSTOMLOCATION: '2021-03-15-preview',

src/azure-cli/azure/cli/command_modules/acs/azurecontainerstorage/_validators.py

@@ -661,7 +661,7 @@ def _validate_nodepools(  # pylint: disable=too-many-branches,too-many-locals
                         'and retry the Azure Container Storage operation.'
                     )
             vm_size = agentpool.get("vm_size")
-            if vm_size is not None:
+            if vm_size is not None and vm_size != "":
                 cpu_value, nvme_enabled = get_vm_sku_details(vm_size.lower())
                 if cpu_value is None or nvme_enabled is None:
                     raise UnknownError(

src/azure-cli/azure/cli/command_modules/acs/managed_cluster_decorator.py

@@ -8825,7 +8825,7 @@ def update_azure_container_storage(self, mc: ManagedCluster) -> ManagedCluster:
             except Exception as ex:
                 raise UnknownError(
                     f"An error occurred while checking the version of Azure Container Storage"
-                    f"extension installed on the cluster: {str(ex)}"
+                    f" extension installed on the cluster: {str(ex)}"
                 ) from ex
 
             disable_azure_container_storage_v1 = disable_azure_container_storage_param is not None and is_container_storage_v1_extension_installed

src/azure-cli/azure/cli/command_modules/appservice/_params.py

@@ -233,10 +233,10 @@ def load_arguments(self, _):
 
     with self.argument_context('functionapp list-flexconsumption-locations') as c:
         c.argument('zone_redundant', arg_type=get_three_state_flag(),
-                   help='Filter the list to return only locations which support zone redundancy.', is_preview=True)
+                   help='Filter the list to return only locations which support zone redundancy.')
         c.argument('show_details', options_list=['--show-details'], arg_type=get_three_state_flag(),
-                   help='Include the runtime details of the regions.', is_preview=True)
-        c.argument('runtime', help="limit the output to just the specified runtime", is_preview=True)
+                   help='Include the runtime details of the regions.')
+        c.argument('runtime', help="limit the output to just the specified runtime")
 
     with self.argument_context('functionapp flex-migration start') as c:
         c.argument('source_resource_group', help='The resource group of the source function app to migrate from.')
@@ -492,20 +492,20 @@ def load_arguments(self, _):
         c.argument('dapr_enable_api_logging', options_list=['--dapr-enable-api-logging', '--dal'], help="Enable/Disable API logging for the Dapr sidecar.", arg_type=get_three_state_flag(return_label=True))
         c.argument('workload_profile_name', help="The name of the workload profile to run the app on.", is_preview=True)
         c.argument('cpu', type=float, help="Required CPU in cores from 0.5 to 2.0.", is_preview=True)
-        c.argument('memory', help="Required momory from 1.0 to 4.0 ending with Gi e.g. 1.0Gi, ", is_preview=True)
+        c.argument('memory', help="Required memory from 1.0 to 4.0 ending with Gi e.g. 1.0Gi, ", is_preview=True)
 
     with self.argument_context('functionapp runtime config') as c:
-        c.argument('runtime_version', help='The version of the functions runtime stack. Use "az functionapp list-flexconsumption-runtimes" to check supported runtimes and versions', is_preview=True)
+        c.argument('runtime_version', help='The version of the functions runtime stack. Use "az functionapp list-flexconsumption-runtimes" to check supported runtimes and versions')
 
     with self.argument_context('functionapp scale config') as c:
-        c.argument('maximum_instance_count', type=int, help="The maximum number of instances.", is_preview=True)
-        c.argument('instance_memory', type=int, help="The instance memory size in MB.", is_preview=True)
-        c.argument('trigger_type', help="The type of trigger.", is_preview=True)
-        c.argument('trigger_settings', nargs='+', help="space-separated settings for the trigger type in the format `<name>=<value>`", is_preview=True)
+        c.argument('maximum_instance_count', type=int, help="The maximum number of instances.")
+        c.argument('instance_memory', type=int, help="The instance memory size in MB.")
+        c.argument('trigger_type', help="The type of trigger.")
+        c.argument('trigger_settings', nargs='+', help="space-separated settings for the trigger type in the format `<name>=<value>`")
 
     with self.argument_context('functionapp scale config always-ready') as c:
-        c.argument('setting_names', nargs='+', help="space-separated always-ready setting names", is_preview=True)
-        c.argument('settings', nargs='+', help="space-separated configuration for the number of pre-allocated instances in the format `<name>=<value>`", is_preview=True)
+        c.argument('setting_names', nargs='+', help="space-separated always-ready setting names")
+        c.argument('settings', nargs='+', help="space-separated configuration for the number of pre-allocated instances in the format `<name>=<value>`")
 
     with self.argument_context('webapp config connection-string list') as c:
         c.argument('name', arg_type=webapp_name_arg_type, id_part=None)
@@ -871,33 +871,33 @@ def load_arguments(self, _):
         c.argument('dapr_http_read_buffer_size', type=int, options_list=['--dapr-http-read-buffer-size', '--dhrbs'], help="Max size of http header read buffer in KB to handle when sending multi-KB headers.")
         c.argument('dapr_log_level', help="The log level for the Dapr sidecar", arg_type=get_enum_type(DAPR_LOG_LEVELS))
         c.argument('dapr_enable_api_logging', options_list=['--dapr-enable-api-logging', '--dal'], help="Enable/Disable API logging for the Dapr sidecar.", arg_type=get_three_state_flag(return_label=True))
-        c.argument('always_ready_instances', nargs='+', help="space-separated configuration for the number of pre-allocated instances in the format `<name>=<value>`", is_preview=True)
-        c.argument('maximum_instance_count', type=int, help="The maximum number of instances.", is_preview=True)
-        c.argument('instance_memory', type=int, help="The instance memory size in MB. See https://aka.ms/flex-instance-sizes for more information on the supported values.", is_preview=True)
+        c.argument('always_ready_instances', nargs='+', help="space-separated configuration for the number of pre-allocated instances in the format `<name>=<value>`")
+        c.argument('maximum_instance_count', type=int, help="The maximum number of instances.")
+        c.argument('instance_memory', type=int, help="The instance memory size in MB. See https://aka.ms/flex-instance-sizes for more information on the supported values.")
         c.argument('flexconsumption_location', options_list=['--flexconsumption-location', '-f'],
-                   help="Geographic location where function app will be hosted. Use `az functionapp list-flexconsumption-locations` to view available locations.", is_preview=True)
+                   help="Geographic location where function app will be hosted. Use `az functionapp list-flexconsumption-locations` to view available locations.")
         c.argument('workspace', help="Name of an existing log analytics workspace to be used for the application insights component")
         c.argument('workload_profile_name', help="The workload profile name to run the container app on.", is_preview=True)
         c.argument('cpu', type=float, help="The CPU in cores of the container app. e.g 0.75", is_preview=True)
         c.argument('memory', help="The memory size of the container app. e.g. 1.0Gi, ", is_preview=True)
-        c.argument('deployment_storage_name', options_list=['--deployment-storage-name', '--dsn'], help="The deployment storage account name.", is_preview=True)
-        c.argument('deployment_storage_container_name', options_list=['--deployment-storage-container-name', '--dscn'], help="The deployment storage account container name.", is_preview=True)
-        c.argument('deployment_storage_auth_type', options_list=['--deployment-storage-auth-type', '--dsat'], arg_type=get_enum_type(DEPLOYMENT_STORAGE_AUTH_TYPES), help="The deployment storage account authentication type.", is_preview=True)
+        c.argument('deployment_storage_name', options_list=['--deployment-storage-name', '--dsn'], help="The deployment storage account name.")
+        c.argument('deployment_storage_container_name', options_list=['--deployment-storage-container-name', '--dscn'], help="The deployment storage account container name.")
+        c.argument('deployment_storage_auth_type', options_list=['--deployment-storage-auth-type', '--dsat'], arg_type=get_enum_type(DEPLOYMENT_STORAGE_AUTH_TYPES), help="The deployment storage account authentication type.")
         c.argument('deployment_storage_auth_value', options_list=['--deployment-storage-auth-value', '--dsav'], help="The deployment storage account authentication value. For the user-assigned managed identity authentication type, "
                    "this should be the user assigned identity resource id. For the storage account connection string authentication type, this should be the name of the app setting that will contain the storage account connection "
-                   "string. For the system assigned managed-identity authentication type, this parameter is not applicable and should be left empty.", is_preview=True)
+                   "string. For the system assigned managed-identity authentication type, this parameter is not applicable and should be left empty.")
         c.argument('zone_redundant', arg_type=get_three_state_flag(),
-                   help='Enable zone redundancy for high availability. Applies to Flex Consumption SKU only.', is_preview=True)
+                   help='Enable zone redundancy for high availability. Applies to Flex Consumption SKU only.')
         c.argument('configure_networking_later', options_list=['--configure-networking-later', '--cnl'], arg_type=get_three_state_flag(),
                    help='Use this option if you want to configure networking later for an app using network-restricted storage.')
 
     with self.argument_context('functionapp deployment config set') as c:
-        c.argument('deployment_storage_name', options_list=['--deployment-storage-name', '--dsn'], help="The deployment storage account name.", is_preview=True)
-        c.argument('deployment_storage_container_name', options_list=['--deployment-storage-container-name', '--dscn'], help="The deployment storage account container name.", is_preview=True)
-        c.argument('deployment_storage_auth_type', options_list=['--deployment-storage-auth-type', '--dsat'], arg_type=get_enum_type(DEPLOYMENT_STORAGE_AUTH_TYPES), help="The deployment storage account authentication type.", is_preview=True)
+        c.argument('deployment_storage_name', options_list=['--deployment-storage-name', '--dsn'], help="The deployment storage account name.")
+        c.argument('deployment_storage_container_name', options_list=['--deployment-storage-container-name', '--dscn'], help="The deployment storage account container name.")
+        c.argument('deployment_storage_auth_type', options_list=['--deployment-storage-auth-type', '--dsat'], arg_type=get_enum_type(DEPLOYMENT_STORAGE_AUTH_TYPES), help="The deployment storage account authentication type.")
         c.argument('deployment_storage_auth_value', options_list=['--deployment-storage-auth-value', '--dsav'], help="The deployment storage account authentication value. For the user-assigned managed identity authentication type, "
                    "this should be the user assigned identity resource id. For the storage account connection string authentication type, this should be the name of the app setting that will contain the storage account connection "
-                   "string. For the system assigned managed-identity authentication type, this parameter is not applicable and should be left empty.", is_preview=True)
+                   "string. For the system assigned managed-identity authentication type, this parameter is not applicable and should be left empty.")
 
     with self.argument_context('functionapp cors credentials') as c:
         c.argument('enable', help='enable/disable access-control-allow-credentials', arg_type=get_three_state_flag())

src/azure-cli/azure/cli/command_modules/appservice/custom.py

@@ -1666,7 +1666,12 @@ def progress_callback(current, total):
         progress_message = 'Uploading {} {}%'.format(progress_bar, percents)
         cmd.cli_ctx.get_progress_controller().add(message=progress_message)
 
-    blob_client = container_client.upload_blob(blob_name, src, validate_content=True, progress_hook=progress_callback)
+    blob_client = None
+    import os
+    with open(os.path.realpath(os.path.expanduser(src)), 'rb') as fs:
+        zip_content = fs.read()
+        blob_client = container_client.upload_blob(blob_name, zip_content, validate_content=True,
+                                                   progress_hook=progress_callback)
 
     now = datetime.datetime.utcnow()
     blob_start = now - datetime.timedelta(minutes=10)

src/azure-cli/azure/cli/command_modules/batch/_breaking_change.py

@@ -0,0 +1,38 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+from azure.cli.core.breaking_change import register_argument_deprecate, register_output_breaking_change
+
+# Arguments
+register_argument_deprecate(
+    "az batch pool create",
+    argument="--target-communication"
+)
+
+# fixed with action=None but check with CLI team
+register_argument_deprecate(
+    "az batch pool create",
+    argument="--resource-tags"
+)
+
+register_argument_deprecate(
+    "az batch pool reset",
+    argument="--target-communication"
+)
+register_argument_deprecate(
+    "az batch pool set",
+    argument="--target-communication"
+)
+
+# Outputs
+register_output_breaking_change(
+    "batch pool show",
+    description="Remove output fields `targetNodeCommunicationMode`, `currentNodeCommunicationMode`, and `resourceTags`"
+)
+
+register_output_breaking_change(
+    "batch pool list",
+    description="Remove output fields `targetNodeCommunicationMode`, `currentNodeCommunicationMode`, and `resourceTags`"
+)

src/azure-cli/azure/cli/command_modules/cognitiveservices/_params.py

@@ -161,10 +161,21 @@ def load_arguments(self, _):
         c.argument('storage', help='The storage accounts for this resource, in JSON array format.')
         c.argument('encryption', help='The encryption properties for this resource, in JSON format.')
 
+    with self.argument_context('cognitiveservices account', arg_group="AI Services") as c:
+        c.argument('allow_project_management',
+                   options_list=['--manage-projects', '--allow-project-management'],
+                   arg_type=get_three_state_flag(),
+                   help='AIServices kind only. Enables project management.  Default true.')
+
     with self.argument_context('cognitiveservices account create') as c:
         c.argument('assign_identity', help='Generate and assign an Azure Active Directory Identity for this account.')
         c.argument('yes', action='store_true', help='Do not prompt for terms confirmation')
 
+    with self.argument_context('cognitiveservices account update', arg_group="AI Services") as c:
+        c.argument('kind',
+                   arg_type=get_enum_type(data=['AIServices', 'OpenAI']),
+                   help='The target API name to transform the existing account into.')
+
     with self.argument_context('cognitiveservices account network-rule') as c:
         c.argument('ip_address', help='IPv4 address or CIDR range.')
         c.argument('subnet', help='Name or ID of subnet. If name is supplied, `--vnet-name` must be supplied.')