Merge branch 'main' into machinesapi

Author: HuShaoRu

scripts/ci/credscan/CredScanSuppressions.json

@@ -294,6 +294,35 @@
         "src\\storage-preview\\azext_storage_preview\\tests\\latest\\recordings\\test_storage_account_local_user.yaml"
       ],
       "_justification": "Fake credentials for recordings reported by new version credential scanner."
+    },
+    {
+      "file": [
+        "src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_distributed_ha_avset_difftransrgShare.yaml",
+        "src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_distributed_ha_avzone_cusrestrustedtransshare.yaml",
+        "src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_distributed_trustedaccessnotransshare.yaml",
+        "src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_singlesystem_cusrestrusted.yaml",
+        "src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_singlesystem_notrusted.yaml"
+      ],
+      "_justification": "[Workloads] False positive."
+    },
+    {
+      "file": [
+        "src\\oracle-database\\azext_oracle_database\\tests\\latest\\test_oracle_db_systems.py",
+        "src\\oracle-database\\azext_oracle_database\\tests\\latest\\recordings\\test_create_db_system.yaml"
+      ],
+      "_justification": "[Oracle Database] False positive."
+    },
+    {
+      "file": [
+        "src\\load\\azext_load\\tests\\latest\\recordings\\test_load_test_run_download_files.yaml"
+      ],
+      "_justification": "[Load] False positive."
+    },
+    {
+      "file": [
+        "src\\databox\\testkey.pvk"
+      ],
+      "_justification": "[Databox] False positive."
     }
   ]
 }

src/acrtransfer/HISTORY.rst

@@ -2,6 +2,10 @@
 
 Release History
 ===============
+1.1.1b1
++++++++
+* Add: Breaking change announcement for new required parameter --storage-access-mode for acr export-pipeline create and acr import-pipeline create commands.
+
 1.1.0
 ++++++
 * Add: New command acr pipeline-run clean - Bulk deletes failed pipeline-runs.

src/acrtransfer/azext_acrtransfer/__init__.py

@@ -5,6 +5,7 @@
 
 from azure.cli.core import AzCommandsLoader
 from azext_acrtransfer._help import helps  # pylint: disable=unused-import
+import azext_acrtransfer._breaking_change  # pylint: disable=unused-import
 
 
 class AcrtransferCommandsLoader(AzCommandsLoader):

src/acrtransfer/azext_acrtransfer/_breaking_change.py

@@ -0,0 +1,17 @@
+# --------------------------------------------------------------------------------------------
+# 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_logic_breaking_change
+
+register_logic_breaking_change('acr export-pipeline create', 'Add required parameter --storage-access-mode',
+                               detail='A new required parameter `--storage-access-mode` will be added. '
+                                      'Allowed values: `entra-mi-auth`, `storage-sas-token`.',
+                               doc_link="https://aka.ms/acr/transfer")
+
+
+register_logic_breaking_change('acr import-pipeline create', 'Add required parameter --storage-access-mode',
+                               detail='A new required parameter `--storage-access-mode` will be added. '
+                                      'Allowed values: `entra-mi-auth`, `storage-sas-token`.',
+                               doc_link="https://aka.ms/acr/transfer")

…ransfer/azext_acrtransfer/tests/__init__ …sfer/azext_acrtransfer/tests/__init__.pysrc/acrtransfer/azext_acrtransfer/tests/__init__ renamed to src/acrtransfer/azext_acrtransfer/tests/__init__.py src/acrtransfer/azext_acrtransfer/tests/__init__ renamed to src/acrtransfer/azext_acrtransfer/tests/__init__.py

@@ -0,0 +1,30 @@
+# --------------------------------------------------------------------------------------------
+# 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.testsdk import ScenarioTest, ResourceGroupPreparer
+
+
+class AcrTransferScenarioTest(ScenarioTest):
+    @ResourceGroupPreparer()
+    def test_acrtransfer_import_pipeline_list(self, resource_group):
+        """Test listing import pipelines"""
+        self.kwargs.update({
+            'registry_name': self.create_random_name('acr', 20),
+            'rg': resource_group,
+            'location': 'eastus',
+            'sku': 'Premium'
+        })
+
+        self.cmd('acr create -n {registry_name} -g {rg} -l {location} --sku {sku}', checks=[
+            self.check('name', '{registry_name}'),
+            self.check('location', '{location}'),
+            self.check('sku.name', '{sku}')
+        ])
+
+        self.cmd('acr import-pipeline list -r {registry_name} -g {rg}', checks=[
+            self.check('length(@)', 0)
+        ])
+        self.cmd('acr delete -n {registry_name} -g {rg} -y')
+

…/azext_acrtransfer/tests/latest/__init__ …ext_acrtransfer/tests/latest/__init__.pysrc/acrtransfer/azext_acrtransfer/tests/latest/__init__ renamed to src/acrtransfer/azext_acrtransfer/tests/latest/__init__.py src/acrtransfer/azext_acrtransfer/tests/latest/__init__ renamed to src/acrtransfer/azext_acrtransfer/tests/latest/__init__.py

@@ -14,7 +14,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
 
 # HISTORY.rst entry.
-VERSION = '1.1.0'
+VERSION = '1.1.1b1'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers