Sync

.flake8

@@ -7,6 +7,7 @@ ignore =
     F401,  # imported but unused, too many violations, to be removed in the future
     F811,  # redefinition of unused, to be removed in the future
     C901   # code flow is too complex, too many violations, to be removed in the future
+    W503   # line break before binary operator effect on readability is subjective
     W504   # line break after binary operator effect on readability is subjective
 exclude =
     */vendored_sdks

.github/CODEOWNERS

@@ -94,7 +94,7 @@
 
 /src/alertsmanagement/ @qwordy
 
-/src/stream-analytics/ @houk-ms
+/src/stream-analytics/ @houk-ms @necusjz
 
 /src/databricks/ @fengzhou-msft @xfz11
 

linter_exclusions.yml

@@ -52,6 +52,9 @@ aks create:
     load_balancer_managed_outbound_ip_count:
       rule_exclusions:
       - option_length_too_long
+    load_balancer_managed_outbound_ipv6_count:
+      rule_exclusions:
+      - option_length_too_long
     load_balancer_outbound_ip_prefixes:
       rule_exclusions:
       - option_length_too_long
@@ -161,6 +164,9 @@ aks update:
     load_balancer_managed_outbound_ip_count:
       rule_exclusions:
       - option_length_too_long
+    load_balancer_managed_outbound_ipv6_count:
+      rule_exclusions:
+      - option_length_too_long
     load_balancer_outbound_ip_prefixes:
       rule_exclusions:
       - option_length_too_long
@@ -1627,6 +1633,35 @@ network vhub connection create:
     allow_remote_vnet_to_use_hub_vnet_gateways:
       rule_exclusions:
       - option_length_too_long
+network vpn-gateway connection vpn-site-link-conn add:
+  parameters:
+    use_local_azure_ip_address:
+      rule_exclusions:
+      - option_length_too_long
+    use_policy_based_traffic_selectors:
+      rule_exclusions:
+      - option_length_too_long
+    vpn_connection_protocol_type:
+      rule_exclusions:
+      - option_length_too_long
+    vpn_link_connection_mode:
+      rule_exclusions:
+      - option_length_too_long
+network vpn-gateway connection vpn-site-link-conn ipsec-policy add:
+  parameters:
+    vpn_site_link_conn_name:
+      rule_exclusions:
+      - option_length_too_long
+network vpn-gateway connection vpn-site-link-conn ipsec-policy list:
+  parameters:
+    vpn_site_link_conn_name:
+      rule_exclusions:
+      - option_length_too_long
+network vpn-gateway connection vpn-site-link-conn ipsec-policy remove:
+  parameters:
+    vpn_site_link_conn_name:
+      rule_exclusions:
+      - option_length_too_long
 network vpn-server-config create:
   parameters:
     radius_client_root_certs:

pylintrc

@@ -21,7 +21,7 @@ disable=
 
 [TYPECHECK]
 # For Azure CLI extensions, we ignore some import errors as they'll be available in the environment of the CLI
-ignored-modules=azure,azure.cli,azure.cli.core,azure.cli.core.commands,knack,msrestazure,argcomplete,azure_devtools,isodate,OpenSSL
+ignored-modules=azure,azure.cli,azure.cli.core,azure.cli.core.commands,knack,msrestazure,argcomplete,azure.cli.testsdk,isodate,OpenSSL
 
 [FORMAT]
 max-line-length=120

src/account/azext_account/tests/latest/test_account_scenario.py

@@ -7,7 +7,7 @@
 import unittest
 import time
 
-from azure_devtools.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse
 from azure.cli.testsdk import (ScenarioTest, ResourceGroupPreparer)
 
 

src/acrtransfer/HISTORY.rst

@@ -2,7 +2,13 @@
 
 Release History
 ===============
+1.1.0
+++++++
+* Add: New command acr pipeline-run clean - Bulk deletes failed pipeline-runs.
+* Add: New parameter to acr pipeline-run list --top - Displays only the n most recent pipeline-runs.
+* Bug fix: ResourceNotFoundError will now be thrown if the resource does not exist when calling import-pipeline delete and export-pipeline delete.
+* Bug fix: Help text typos fixed.
 
-0.1.0
+1.0.0
 ++++++
 * Initial release.

src/acrtransfer/azext_acrtransfer/__init__.py

@@ -15,8 +15,7 @@ def __init__(self, cli_ctx=None):
         acrtransfer_custom = CliCommandType(
             operations_tmpl='azext_acrtransfer.custom#{}',
             client_factory=cf_acrtransfer)
-        super(AcrtransferCommandsLoader, self).__init__(cli_ctx=cli_ctx,
-                                                        custom_command_type=acrtransfer_custom)
+        super().__init__(cli_ctx=cli_ctx, custom_command_type=acrtransfer_custom)
 
     def load_command_table(self, args):
         from azext_acrtransfer.commands import load_command_table

src/acrtransfer/azext_acrtransfer/_format.py

@@ -5,7 +5,9 @@
 # pylint: disable=line-too-long
 
 from collections import OrderedDict
-from distutils import log as logger
+from knack.log import get_logger
+
+logger = get_logger(__name__)
 
 
 def import_pipeline_output_format(result):
@@ -40,25 +42,26 @@ def _export_pipeline_format_group(item):
 
 def _pipeline_run_format_group(item):
     if "importPipelines" in _get_value(item, 'request', 'pipelineResourceId'):
-        return OrderedDict([
+        d = OrderedDict([
             ('NAME', _get_value(item, 'name')),
-            ('PIPELINE', _get_value(item, 'request', 'pipelineResourceId').split('/')[-1]),
-            ('START_TIME', _get_value(item, 'response', 'startTime').split('.')[0]),
+            ('PIPELINE', _get_value(item, 'request', 'pipelineResourceId').split('/', maxsplit=-1)[-1]),
+            ('START_TIME', _get_value(item, 'response', 'startTime').split('.', maxsplit=1)[0]),
             ('DURATION', _get_duration(_get_value(item, 'response', 'startTime'), _get_value(item, 'response', 'finishTime'))),
             ('SOURCE_TRIGGER', str('_' in _get_value(item, 'name'))),
             ('STATUS', _get_value(item, 'response', 'status')),
             ('ERROR_MESSAGE', _get_value(item, 'response', 'pipelineRunErrorMessage'))
         ])
 
     else:
-        return OrderedDict([
+        d = OrderedDict([
             ('NAME', _get_value(item, 'name')),
-            ('PIPELINE', _get_value(item, 'request', 'pipelineResourceId').split('/')[-1]),
-            ('START_TIME', _get_value(item, 'response', 'startTime').split('.')[0]),
+            ('PIPELINE', _get_value(item, 'request', 'pipelineResourceId').split('/', maxsplit=-1)[-1]),
+            ('START_TIME', _get_value(item, 'response', 'startTime').split('.', maxsplit=1)[0]),
             ('DURATION', _get_duration(_get_value(item, 'response', 'startTime'), _get_value(item, 'response', 'finishTime'))),
             ('STATUS', _get_value(item, 'response', 'status')),
             ('ERROR_MESSAGE', _get_value(item, 'response', 'pipelineRunErrorMessage'))
         ])
+    return d
 
 
 def _output_format(result, format_group):
@@ -86,10 +89,10 @@ def _get_duration(start_time, finish_time):
     from dateutil.parser import parse
     try:
         duration = parse(finish_time) - parse(start_time)
-        hours = "{0:02d}".format((24 * duration.days) + (duration.seconds // 3600))
-        minutes = "{0:02d}".format((duration.seconds % 3600) // 60)
-        seconds = "{0:02d}".format(duration.seconds % 60)
-        return "{0}:{1}:{2}".format(hours, minutes, seconds)
+        hours = f'{((24 * duration.days) + (duration.seconds // 3600)):02d}'
+        minutes = f'{((duration.seconds % 3600) // 60):02d}'
+        seconds = f'{(duration.seconds % 60):02d}'
+        return f'{hours}:{minutes}:{seconds}'
     except (ValueError, TypeError):
-        logger.debug("Unable to get duration with start_time '%s' and finish_time '%s'", start_time, finish_time)
+        logger.debug('Unable to get duration with start_time %s and finish_time %s', start_time, finish_time)
         return ' '

src/acrtransfer/azext_acrtransfer/_help.py

@@ -19,7 +19,7 @@
 
 helps['acr pipeline-run'] = """
     type: group
-    short-summary: Manage ACR import and export pipeline runs.
+    short-summary: Manage ACR import and export pipeline-runs.
 """
 
 helps['acr import-pipeline create'] = """
@@ -28,7 +28,7 @@
     examples:
         - name: Create an import pipeline.
           text: az acr import-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer
-        - name: Create an import pipeline with a user assigned identity, all available options, and source trigger disabled.
+        - name: Create an import pipeline with a user-assigned identity, all available options, and source trigger disabled.
           text: az acr import-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer --options DeleteSourceBlobOnSuccess OverwriteTags ContinueOnErrors --assign-identity /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity --source-trigger-enabled False
 """
 
@@ -62,7 +62,7 @@
     examples:
         - name: Create an export pipeline.
           text: az acr export-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer
-        - name: Create an export pipeline with a user assigned identity and all available options.
+        - name: Create an export pipeline with a user-assigned identity and all available options.
           text: az acr export-pipeline create --resource-group $MyRG --registry $MyReg --name $MyPipeline --secret-uri https://$MyKV.vault.azure.net/secrets/$MySecret --storage-container-uri https://$MyStorage.blob.core.windows.net/$MyContainer --options OverwriteBlobs ContinueOnErrors --assign-identity /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity
 """
 
@@ -92,34 +92,44 @@
 
 helps['acr pipeline-run create'] = """
     type: command
-    short-summary: Create a pipeline run.
+    short-summary: Create a pipeline-run.
     examples:
-        - name: Create an import pipeline run.
+        - name: Create an import pipeline-run.
           text: az acr pipeline-run create --resource-group $MyRG --registry $MyReg --pipeline $MyPipeline --name $MyPipelineRunName --pipeline-type import --storage-blob $MyBlob
-        - name: Create an export pipeline run and force redeploy.
+        - name: Create an export pipeline-run and force redeploy.
           text: az acr pipeline-run create --resource-group $MyRG --registry $MyReg --pipeline $MyPipeline --name $MyPipelineRunName --pipeline-type export --storage-blob $MyBlob --artifacts hello-world:latest hello-world@sha256:90659bf80b44ce6be8234e6ff90a1ac34acbeb826903b02cfa0da11c82cbc042 --force-redeploy
 """
 
 helps['acr pipeline-run list'] = """
     type: command
-    short-summary: List pipelineruns of all pipelines on a container registry.
+    short-summary: List pipeline-runs of all pipelines on a container registry.
     examples:
-        - name: List all export pipelines on a container registry
+        - name: List all pipeline-runs on a container registry
           text: az acr pipeline-run list --resource-group $MyRG --registry $MyReg
 """
 
 helps['acr pipeline-run show'] = """
     type: command
-    short-summary: Show an export pipeline in detail.
+    short-summary: Show a pipeline-run in detail.
     examples:
-        - name: Show a specific export pipeline in detail.
+        - name: Show a specific pipeline-run in detail.
           text: az acr pipeline-run show --resource-group $MyRG --registry $MyReg --name $MyPipelineRun
 """
 
 helps['acr pipeline-run delete'] = """
     type: command
-    short-summary: Delete an export pipeline.
+    short-summary: Delete a pipeline-run.
     examples:
-        - name: Delete an export pipeline.
+        - name: Delete a pipeline-run.
           text: az acr pipeline-run delete --resource-group $MyRG --registry $MyReg --name $MyPipelineRun
 """
+
+helps['acr pipeline-run clean'] = """
+    type: command
+    short-summary: Delete all failed pipeline-runs on the registry.
+    examples:
+        - name: Delete all failed pipeline-runs on the registry.
+          text: az acr pipeline-run clean --resource-group $MyRG --registry $MyReg
+        - name: List the failed pipeline-runs that would have been deleted, but do not delete any.
+          text: az acr pipeline-run clean --resource-group $MyRG --registry $MyReg --dry-run -o table
+"""

src/acrtransfer/azext_acrtransfer/_params.py

@@ -4,7 +4,7 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=line-too-long
 
-from ._validators import validate_export_options, validate_import_options, validate_keyvault_secret_uri, validate_pipeline_type, validate_storage_account_container_uri, validate_user_assigned_identity_resource_id
+from ._validators import validate_export_options, validate_import_options, validate_keyvault_secret_uri, validate_pipeline_type, validate_storage_account_container_uri, validate_user_assigned_identity_resource_id, validate_top
 
 
 def load_arguments(self, _):
@@ -35,3 +35,7 @@ def load_arguments(self, _):
         c.argument('force_update_tag', options_list=['--force-redeploy', '-f'], action='store_true', help='Flag that forces ARM to redeploy resource even if no parameters have changed.')
         c.argument('storage_blob_name', options_list=['--storage-blob', '-b'], help='Name of the storage blob to be imported or exported.')
         c.argument('artifacts', options_list=['--artifacts', '-a'], nargs='+', help='Space-separated list of container artifacts. Artifacts must be either of the form `repository:tag` or `repository@digest` such as hello-world:latest or hello-world@sha256:90659bf80b44ce6be8234e6ff90a1ac34acbeb826903b02cfa0da11c82cbc042.')
+        c.argument('top', validator=validate_top, help='List only the last n pipeline-runs. Must be an integer.')
+
+    with self.argument_context('acr pipeline-run clean') as c:
+        c.argument('dry_run', action='store_true', help='List the failed pipeline-runs that would have been deleted, but do not delete any.')

src/acrtransfer/azext_acrtransfer/_validators.py

@@ -4,8 +4,10 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=line-too-long
 
-from distutils import log as logger
-from knack.util import CLIError
+from knack.log import get_logger
+from azure.cli.core.azclierror import InvalidArgumentValueError
+
+logger = get_logger(__name__)
 
 
 def validate_storage_account_container_uri(namespace):
@@ -16,7 +18,7 @@ def validate_storage_account_container_uri(namespace):
         valid = False
 
     if not valid:
-        logger.warn("Invalid storage account container URI. Please provide a storage account container URI of the form https://$MyStorageAccount.blob.core.windows.net/$MyContainer. Note - The exact URI form may be different outside of AzureCloud.")
+        logger.warning("Invalid storage account container URI. Please provide a storage account container URI of the form https://$MyStorageAccount.blob.core.windows.net/$MyContainer. Note - The exact URI form may be different outside of AzureCloud.")
 
 
 def validate_keyvault_secret_uri(namespace):
@@ -27,7 +29,7 @@ def validate_keyvault_secret_uri(namespace):
         valid = False
 
     if not valid:
-        logger.warn("Invalid keyvault secret URI. Please provide a keyvault secret URI of the form https://$MyKeyvault.vault.azure.net/secrets/$MySecret. Note - The exact URI form may be different outside of AzureCloud.")
+        logger.warning("Invalid keyvault secret URI. Please provide a keyvault secret URI of the form https://$MyKeyvault.vault.azure.net/secrets/$MySecret. Note - The exact URI form may be different outside of AzureCloud.")
 
 
 def validate_user_assigned_identity_resource_id(namespace):
@@ -41,7 +43,7 @@ def validate_user_assigned_identity_resource_id(namespace):
         valid = False
 
     if not valid:
-        logger.warn("Invalid user assigned identity resource ID. Please provide a user assigned identity resource ID of the form /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity.")
+        logger.warning("Invalid user assigned identity resource ID. Please provide a user assigned identity resource ID of the form /subscriptions/$MySubID/resourceGroups/$MyRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$MyIdentity.")
 
 
 def validate_import_options(namespace):
@@ -57,8 +59,8 @@ def validate_import_options(namespace):
         valid = False
 
     if not valid:
-        logger.warn("Allowed options are: " + str(allowed_options_list))
-        logger.warn("Invalid option found in options parameter. Please provide a space-separated list of allowed options.")
+        logger.warning("Allowed options are: %s", str(allowed_options_list))
+        logger.warning("Invalid option found in options parameter. Please provide a space-separated list of allowed options.")
 
 
 def validate_export_options(namespace):
@@ -74,8 +76,8 @@ def validate_export_options(namespace):
         valid = False
 
     if not valid:
-        logger.warn("Allowed options are: " + str(allowed_options_list))
-        logger.warn("Invalid option found in options parameter. Please provide a space-separated list of allowed options.")
+        logger.warning('Allowed options are: %s', str(allowed_options_list))
+        logger.warning("Invalid option found in options parameter. Please provide a space-separated list of allowed options.")
 
 
 def validate_pipeline_type(namespace):
@@ -86,4 +88,17 @@ def validate_pipeline_type(namespace):
         valid = False
 
     if not valid:
-        logger.warn("Invalid pipeline type. Pipeline type must be import or export.")
+        logger.warning("Invalid pipeline type. Pipeline type must be import or export.")
+
+
+def validate_top(namespace):
+    n = namespace.top
+
+    if n is None:
+        return
+
+    try:
+        int(n)
+
+    except ValueError as e:
+        raise InvalidArgumentValueError(f'Argument provided for parameter top \'{n}\' is not an integer. Please provide an integer for the top parameter.') from e

src/acrtransfer/azext_acrtransfer/commands.py

@@ -45,3 +45,4 @@ def load_command_table(self, _):
         g.custom_command('delete', 'delete_pipelinerun')
         g.custom_command('list', 'list_pipelinerun')
         g.custom_show_command('show', 'get_pipelinerun')
+        g.custom_command('clean', 'clean_pipelinerun')

src/acrtransfer/azext_acrtransfer/custom.py

@@ -4,6 +4,6 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=unused-import
 
-from .pipelinerun import create_pipelinerun, get_pipelinerun, delete_pipelinerun, list_pipelinerun
+from .pipelinerun import create_pipelinerun, get_pipelinerun, delete_pipelinerun, list_pipelinerun, clean_pipelinerun
 from .exportpipeline import create_exportpipeline, get_exportpipeline, delete_exportpipeline, list_exportpipeline
 from .importpipeline import create_importpipeline, get_importpipeline, delete_importpipeline, list_importpipeline

src/acrtransfer/azext_acrtransfer/exportpipeline.py

@@ -4,6 +4,7 @@
 # --------------------------------------------------------------------------------------------
 # pylint: disable=line-too-long
 
+from azure.cli.core.azclierror import ResourceNotFoundError
 from .vendored_sdks.containerregistry.v2019_12_01_preview.models._models_py3 import ExportPipeline, ExportPipelineTargetProperties
 from .vendored_sdks.containerregistry.v2019_12_01_preview.models._container_registry_management_client_enums import PipelineSourceType
 from .utility_functions import create_identity_properties
@@ -46,6 +47,14 @@ def get_exportpipeline(client, resource_group_name, registry_name, export_pipeli
 def delete_exportpipeline(client, resource_group_name, registry_name, export_pipeline_name):
     '''Delete an export pipeline.'''
 
+    try:
+        client.export_pipelines.get(resource_group_name=resource_group_name,
+                                    registry_name=registry_name,
+                                    export_pipeline_name=export_pipeline_name)
+
+    except Exception as e:
+        raise ResourceNotFoundError(f'Export pipeline {export_pipeline_name} not found on registry {registry_name} in the {resource_group_name} resource group.') from e
+
     return client.export_pipelines.begin_delete(resource_group_name=resource_group_name,
                                                 registry_name=registry_name,
                                                 export_pipeline_name=export_pipeline_name)