Skip to content

Commit 94b0732

Browse files
Merge branch 'main' into cnl-hslm-update
2 parents 1207571 + 1fac1ba commit 94b0732

File tree

80 files changed

+23536
-7771
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+23536
-7771
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322

323323
/src/azext_gallery-service-artifact/ @rohitbhoopalam
324324

325-
/src/azext_durabletask/ @RyanLettieri
325+
/src/azext_durabletask/ @berndverst @torosent
326326

327327
/src/acat @qinqingxu @Sherylueen @yongxin-ms @wh-alice
328328

scripts/ci/credscan/CredScanSuppressions.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,35 @@
294294
"src\\storage-preview\\azext_storage_preview\\tests\\latest\\recordings\\test_storage_account_local_user.yaml"
295295
],
296296
"_justification": "Fake credentials for recordings reported by new version credential scanner."
297+
},
298+
{
299+
"file": [
300+
"src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_distributed_ha_avset_difftransrgShare.yaml",
301+
"src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_distributed_ha_avzone_cusrestrustedtransshare.yaml",
302+
"src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_distributed_trustedaccessnotransshare.yaml",
303+
"src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_singlesystem_cusrestrusted.yaml",
304+
"src\\workloads\\azext_workloads\\tests\\latest\\recordings\\test_workloads_singlesystem_notrusted.yaml"
305+
],
306+
"_justification": "[Workloads] False positive."
307+
},
308+
{
309+
"file": [
310+
"src\\oracle-database\\azext_oracle_database\\tests\\latest\\test_oracle_db_systems.py",
311+
"src\\oracle-database\\azext_oracle_database\\tests\\latest\\recordings\\test_create_db_system.yaml"
312+
],
313+
"_justification": "[Oracle Database] False positive."
314+
},
315+
{
316+
"file": [
317+
"src\\load\\azext_load\\tests\\latest\\recordings\\test_load_test_run_download_files.yaml"
318+
],
319+
"_justification": "[Load] False positive."
320+
},
321+
{
322+
"file": [
323+
"src\\databox\\testkey.pvk"
324+
],
325+
"_justification": "[Databox] False positive."
297326
}
298327
]
299328
}

src/acrtransfer/HISTORY.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
33
Release History
44
===============
5+
1.1.1b1
6+
+++++++
7+
* Add: Breaking change announcement for new required parameter --storage-access-mode for acr export-pipeline create and acr import-pipeline create commands.
8+
59
1.1.0
610
++++++
711
* Add: New command acr pipeline-run clean - Bulk deletes failed pipeline-runs.

src/acrtransfer/azext_acrtransfer/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
from azure.cli.core import AzCommandsLoader
77
from azext_acrtransfer._help import helps # pylint: disable=unused-import
8+
import azext_acrtransfer._breaking_change # pylint: disable=unused-import
89

910

1011
class AcrtransferCommandsLoader(AzCommandsLoader):
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# --------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# --------------------------------------------------------------------------------------------
5+
6+
from azure.cli.core.breaking_change import register_logic_breaking_change
7+
8+
register_logic_breaking_change('acr export-pipeline create', 'Add required parameter --storage-access-mode',
9+
detail='A new required parameter `--storage-access-mode` will be added. '
10+
'Allowed values: `entra-mi-auth`, `storage-sas-token`.',
11+
doc_link="https://aka.ms/acr/transfer")
12+
13+
14+
register_logic_breaking_change('acr import-pipeline create', 'Add required parameter --storage-access-mode',
15+
detail='A new required parameter `--storage-access-mode` will be added. '
16+
'Allowed values: `entra-mi-auth`, `storage-sas-token`.',
17+
doc_link="https://aka.ms/acr/transfer")
File renamed without changes.

src/acrtransfer/azext_acrtransfer/tests/latest/__init__ renamed to src/acrtransfer/azext_acrtransfer/tests/latest/__init__.py

File renamed without changes.

src/acrtransfer/azext_acrtransfer/tests/latest/recordings/test_acrtransfer_import_pipeline_list.yaml

Lines changed: 416 additions & 0 deletions
Large diffs are not rendered by default.

src/acrtransfer/azext_acrtransfer/tests/latest/test_acrtransfer_scenario

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# --------------------------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# --------------------------------------------------------------------------------------------
5+
6+
from azure.cli.testsdk import ScenarioTest, ResourceGroupPreparer
7+
8+
9+
class AcrTransferScenarioTest(ScenarioTest):
10+
@ResourceGroupPreparer()
11+
def test_acrtransfer_import_pipeline_list(self, resource_group):
12+
"""Test listing import pipelines"""
13+
self.kwargs.update({
14+
'registry_name': self.create_random_name('acr', 20),
15+
'rg': resource_group,
16+
'location': 'eastus',
17+
'sku': 'Premium'
18+
})
19+
20+
self.cmd('acr create -n {registry_name} -g {rg} -l {location} --sku {sku}', checks=[
21+
self.check('name', '{registry_name}'),
22+
self.check('location', '{location}'),
23+
self.check('sku.name', '{sku}')
24+
])
25+
26+
self.cmd('acr import-pipeline list -r {registry_name} -g {rg}', checks=[
27+
self.check('length(@)', 0)
28+
])
29+
self.cmd('acr delete -n {registry_name} -g {rg} -y')
30+

0 commit comments

Comments
 (0)