Merge branch 'azure-dev' into dev

.github/CODEOWNERS

@@ -21,11 +21,11 @@
 /src/azure-cli/azure/cli/command_modules/acs/ @fengzhou-msft @zqingqing1 @gtracer @xizhamsft @andyliuliming
 /src/azure-cli/azure/cli/command_modules/advisor/ @Prasanna-Padmanabhan
 /src/azure-cli/azure/cli/command_modules/apim/ @kevinhillinger @jonlester
-/src/azure-cli/azure/cli/command_modules/appconfig/ @shenmuxiaosen @avanigupta @qwordy
+/src/azure-cli/azure/cli/command_modules/appconfig/ @shenmuxiaosen @avanigupta @qwordy @zhoxing-ms
 /src/azure-cli/azure/cli/command_modules/appservice/ @qwordy @Juliehzl
 /src/azure-cli/azure/cli/command_modules/aro/ @mjudeikis @jim-minter
 /src/azure-cli/azure/cli/command_modules/backup/ @dragonfly91 @fengzhou-msft @qwordy @akshayneema
-/src/azure-cli/azure/cli/command_modules/batch/ @bgklein @gingi @dpwatrous @paterasMSFT @qwordy
+/src/azure-cli/azure/cli/command_modules/batch/ @bgklein @gingi @dpwatrous @paterasMSFT @qwordy @zhoxing-ms
 /src/azure-cli/azure/cli/command_modules/batchai/ @AlexanderYukhanov
 /src/azure-cli/azure/cli/command_modules/cloud/ @jiasli @fengzhou-msft @Juliehzl
 /src/azure-cli/azure/cli/command_modules/consumption/ @sandeepnl
@@ -52,9 +52,9 @@
 /src/azure-cli/azure/cli/command_modules/role/ @jiasli @evelyn-ys @jsntcy @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/search/ @huangbolun @kairu-ms
 /src/azure-cli/azure/cli/command_modules/servicebus/ @v-ajnava @fengzhou-msft
-/src/azure-cli/azure/cli/command_modules/servicefabric/ @QingChenmsft @qwordy
+/src/azure-cli/azure/cli/command_modules/servicefabric/ @QingChenmsft @qwordy @Juliehzl
 /src/azure-cli/azure/cli/command_modules/sql/ @jaredmoo @Juliehzl @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/storage/ @Juliehzl @jsntcy @zhoxing-ms @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/synapse/ @idear1203 @sunsw1994 @aim-for-better
 /src/azure-cli/azure/cli/command_modules/util/ @jiasli @Juliehzl @zhoxing-ms @evelyn-ys
-/src/azure-cli/azure/cli/command_modules/vm/ @qwordy @houk-ms @yungezz
+/src/azure-cli/azure/cli/command_modules/vm/ @qwordy @houk-ms @yungezz @Juliehzl @zhoxing-ms

pylintrc

@@ -24,7 +24,6 @@ disable=
     locally-disabled,
     missing-docstring,
     missing-kwoa,
-    no-else-continue,
     no-member,
     no-value-for-parameter,
     raise-missing-from,
@@ -35,7 +34,6 @@ disable=
     too-many-function-args,
     too-many-lines,
     unnecessary-comprehension,
-    unrecognized-inline-option,
     use-a-generator,
     using-constant-test,
     wrong-import-order,

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

@@ -174,8 +174,7 @@ def _get_clean_args(command, args):  # TODO: add test for this function
                 continue
 
             # else if positional or optional argument / value
-            else:
-                cleaned_args.append(placeholder)
+            cleaned_args.append(placeholder)
 
         return cleaned_args
 

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

@@ -284,7 +284,7 @@ def parse_known_args(self, args=None, namespace=None):
         self._namespace, self._raw_arguments = super().parse_known_args(args=args, namespace=namespace)
         return self._namespace, self._raw_arguments
 
-    def _check_value(self, action, value):  # pylint: too-many-locals, too-many-branches
+    def _check_value(self, action, value):
         # Override to customize the error message when a argument is not among the available choices
         # converted value must be one of the choices (if specified)
         if action.choices is not None and value not in action.choices:  # pylint: disable=too-many-nested-blocks

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

@@ -136,7 +136,7 @@ def default_api_version(self):
 AZURE_API_PROFILES = {
     'latest': {
         ResourceType.MGMT_STORAGE: '2021-04-01',
-        ResourceType.MGMT_NETWORK: '2020-11-01',
+        ResourceType.MGMT_NETWORK: '2021-02-01',
         ResourceType.MGMT_COMPUTE: SDKProfile('2020-12-01', {
             'resource_skus': '2019-04-01',
             'disks': '2020-12-01',

src/azure-cli/azure/cli/command_modules/acr/_utils.py

@@ -9,7 +9,6 @@
 from knack.util import CLIError
 from knack.log import get_logger
 
-from knack.prompting import prompt_y_n, NoTTYException
 from msrestazure.azure_exceptions import CloudError
 from azure.cli.core.commands import LongRunningOperation
 from azure.cli.core.commands.parameters import get_resources_in_subscription
@@ -195,17 +194,6 @@ def _invalid_sku_downgrade():
         "Managed registries could not be downgraded to Classic SKU.")
 
 
-def user_confirmation(message, yes=False):
-    if yes:
-        return
-    try:
-        if not prompt_y_n(message):
-            raise CLIError('Operation cancelled.')
-    except NoTTYException:
-        raise CLIError(
-            'Unable to prompt for confirmation as no tty available. Use --yes.')
-
-
 def get_validate_platform(cmd, platform):
     """Gets and validates the Platform from both flags
     :param str platform: The name of Platform passed by user in --platform flag

src/azure-cli/azure/cli/command_modules/acr/agentpool.py

@@ -6,10 +6,10 @@
 from msrest.exceptions import ValidationError
 from knack.log import get_logger
 from knack.util import CLIError
+from azure.cli.core.util import user_confirmation
 from ._utils import (
     get_registry_by_name,
     validate_managed_registry,
-    user_confirmation
 )
 
 DEFAULT_COUNT = 1

src/azure-cli/azure/cli/command_modules/acr/connected_registry.py

@@ -9,6 +9,7 @@
 from knack.util import CLIError
 from azure.cli.core.commands import LongRunningOperation
 from azure.cli.core.commands.client_factory import get_subscription_id
+from azure.cli.core.util import user_confirmation
 from ._client_factory import cf_acr_tokens, cf_acr_scope_maps
 from ._utils import (
     build_token_id,
@@ -17,7 +18,6 @@
     get_scope_map_from_id,
     get_token_from_id,
     parse_scope_map_actions,
-    user_confirmation,
     validate_managed_registry
 )
 

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

@@ -5,14 +5,14 @@
 
 from knack.util import CLIError
 from knack.log import get_logger
+from azure.cli.core.util import user_confirmation
 
 from ._constants import get_managed_sku, get_premium_sku
 from ._utils import (
     get_registry_by_name,
     validate_managed_registry,
     validate_sku_update,
     get_resource_group_name_by_registry_name,
-    user_confirmation,
     resolve_identity_client_id
 )
 from ._docker_utils import get_login_credentials, EMPTY_GUID

src/azure-cli/azure/cli/command_modules/acr/helm.py

@@ -10,9 +10,7 @@
 from knack.util import CLIError
 from knack.log import get_logger
 
-from azure.cli.core.util import in_cloud_console
-
-from ._utils import user_confirmation
+from azure.cli.core.util import in_cloud_console, user_confirmation
 
 from ._docker_utils import (
     get_access_credentials,

src/azure-cli/azure/cli/command_modules/acr/repository.py

@@ -10,8 +10,8 @@
 
 from knack.util import CLIError
 from knack.log import get_logger
+from azure.cli.core.util import user_confirmation
 
-from ._utils import user_confirmation
 from ._docker_utils import (
     request_data_from_registry,
     get_access_credentials,

src/azure-cli/azure/cli/command_modules/acr/task.py

@@ -9,6 +9,7 @@
 from knack.log import get_logger
 from knack.util import CLIError
 from azure.cli.core.commands import LongRunningOperation
+from azure.cli.core.util import user_confirmation
 from ._utils import (
     get_registry_by_name,
     validate_managed_registry,
@@ -19,7 +20,6 @@
     remove_timer_trigger,
     get_task_id_from_task_name,
     prepare_source_location,
-    user_confirmation
 )
 from ._stream_utils import stream_logs
 from ._constants import (

src/azure-cli/azure/cli/command_modules/acr/taskrun.py

@@ -3,11 +3,9 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
+from azure.cli.core.util import user_confirmation
 from ._stream_utils import stream_logs
-from ._utils import (
-    user_confirmation,
-    validate_managed_registry
-)
+from ._utils import validate_managed_registry
 
 
 TASKRUN_NOT_SUPPORTED = 'TaskRun is only supported for managed registries.'

src/azure-cli/azure/cli/command_modules/acr/tests/latest/recordings/test_acr_agentpool.yaml

@@ -77,7 +77,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.3 (Windows-10-10.0.19041-SP0)
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/agentvnets?api-version=2020-11-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/agentvnets?api-version=2021-02-01
   response:
     body:
       string: "{\r\n  \"name\": \"agentvnets\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/agentvnets\",\r\n
@@ -100,7 +100,7 @@ interactions:
       azure-asyncnotification:
       - Enabled
       azure-asyncoperation:
-      - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/ef015977-744b-4dcb-b809-8226815f677a?api-version=2020-11-01
+      - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/ef015977-744b-4dcb-b809-8226815f677a?api-version=2021-02-01
       cache-control:
       - no-cache
       content-length:
@@ -143,7 +143,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.3 (Windows-10-10.0.19041-SP0)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/ef015977-744b-4dcb-b809-8226815f677a?api-version=2020-11-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/ef015977-744b-4dcb-b809-8226815f677a?api-version=2021-02-01
   response:
     body:
       string: "{\r\n  \"status\": \"Succeeded\"\r\n}"
@@ -192,7 +192,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.3 (Windows-10-10.0.19041-SP0)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/agentvnets?api-version=2020-11-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/agentvnets?api-version=2021-02-01
   response:
     body:
       string: "{\r\n  \"name\": \"agentvnets\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/agentvnets\",\r\n
@@ -5873,15 +5873,15 @@ interactions:
       User-Agent:
       - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.3 (Windows-10-10.0.19041-SP0)
     method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/agentvnets?api-version=2020-11-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/virtualNetworks/agentvnets?api-version=2021-02-01
   response:
     body:
       string: ''
     headers:
       azure-asyncnotification:
       - Enabled
       azure-asyncoperation:
-      - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/47388224-3ff4-469b-ad51-5ee98f8a2a85?api-version=2020-11-01
+      - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/47388224-3ff4-469b-ad51-5ee98f8a2a85?api-version=2021-02-01
       cache-control:
       - no-cache
       content-length:
@@ -5891,7 +5891,7 @@ interactions:
       expires:
       - '-1'
       location:
-      - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operationResults/47388224-3ff4-469b-ad51-5ee98f8a2a85?api-version=2020-11-01
+      - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operationResults/47388224-3ff4-469b-ad51-5ee98f8a2a85?api-version=2021-02-01
       pragma:
       - no-cache
       server:
@@ -5924,7 +5924,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.19.0 azsdk-python-azure-mgmt-network/18.0.0 Python/3.7.3 (Windows-10-10.0.19041-SP0)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/47388224-3ff4-469b-ad51-5ee98f8a2a85?api-version=2020-11-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/eastus/operations/47388224-3ff4-469b-ad51-5ee98f8a2a85?api-version=2021-02-01
   response:
     body:
       string: "{\r\n  \"status\": \"Succeeded\"\r\n}"