Skip to content

Commit fa22547

Browse files
william051200william051200
committed
Merge remote-tracking branch 'origin/dev' into image-migration
2 parents c888cb0 + d0feba3 commit fa22547

94 files changed

Lines changed: 146156 additions & 67316 deletions

File tree

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*help.yaml @kairu-ms @jiasli @jsntcy
55
*help.yml @kairu-ms @jiasli @jsntcy
66

7-
/linter_exclusions.yml @jsntcy @kairu-ms @zhoxing-ms
7+
/linter_exclusions.yml @jsntcy @kairu-ms @yanzhudd
88

99
/doc/ @jiasli @kairu-ms @jsntcy @necusjz @yanzhudd
1010
/tools/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
@@ -13,22 +13,22 @@
1313
/scripts/live_test @kairu-ms @wangzelin007 @naga-nandyala
1414
/src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms @wangzelin007 @bebound
1515

16-
/src/azure-cli-core/ @jiasli @jsntcy @kairu-ms @zhoxing-ms @calvinhzy @necusjz @bebound @DanielMicrosoft @ReaNAiveD
16+
/src/azure-cli-core/ @jiasli @jsntcy @kairu-ms @yanzhudd @calvinhzy @necusjz @bebound @DanielMicrosoft @ReaNAiveD
1717
/src/azure-cli-core/azure/cli/core/_profile.py @jiasli @bebound
1818
/src/azure-cli-core/azure/cli/core/auth/ @jiasli @bebound
1919
/src/azure-cli-core/azure/cli/core/extension/ @jsntcy @kairu-ms
20-
/src/azure-cli-core/azure/cli/core/style.py @jiasli @zhoxing-ms
20+
/src/azure-cli-core/azure/cli/core/style.py @jiasli @yanzhudd
2121
/src/azure-cli-core/azure/cli/core/aaz/ @kairu-ms @necusjz @calvinhzy @jsntcy @DanielMicrosoft @ReaNAiveD
2222

23-
/src/azure-cli/azure/cli/command_modules/acr/ @zhoxing-ms @northtyphoon @rosanch @jsntcy @yanzhudd
24-
/src/azure-cli/azure/cli/command_modules/acs/ @zhoxing-ms @zqingqing1 @gtracer @xizhamsft @andyliuliming @fumingzhang @jsntcy @yanzhudd
23+
/src/azure-cli/azure/cli/command_modules/acr/ @northtyphoon @rosanch @jsntcy @yanzhudd
24+
/src/azure-cli/azure/cli/command_modules/acs/ @zqingqing1 @gtracer @xizhamsft @andyliuliming @fumingzhang @jsntcy @yanzhudd
2525
/src/azure-cli/azure/cli/command_modules/advisor/ @jsntcy @Prasanna-Padmanabhan
2626
/src/azure-cli/azure/cli/command_modules/apim/ @jsntcy @kevinhillinger @jonlester
27-
/src/azure-cli/azure/cli/command_modules/appconfig/ @zhoxing-ms @jsntcy @yanzhudd @ChristineWanjau @albertofori @avanigupta @mrm9084
28-
/src/azure-cli/azure/cli/command_modules/appservice/ @jsntcy @zhoxing-ms @yanzhudd @panchagnula
27+
/src/azure-cli/azure/cli/command_modules/appconfig/ @jsntcy @yanzhudd @ChristineWanjau @albertofori @avanigupta @mrm9084
28+
/src/azure-cli/azure/cli/command_modules/appservice/ @jsntcy @yanzhudd @panchagnula
2929
/src/azure-cli/azure/cli/command_modules/aro/ @jsntcy @bennerv @hawkowl @jewzaam @rogbas @necusjz
30-
/src/azure-cli/azure/cli/command_modules/backup/ @zhoxing-ms @jsntcy @yanzhudd @dragonfly91 @akshayneema
31-
/src/azure-cli/azure/cli/command_modules/batch/ @zhoxing-ms @jsntcy @yanzhudd @cRui861 @wanghoppe @dpwatrous @wiboris
30+
/src/azure-cli/azure/cli/command_modules/backup/ @jsntcy @yanzhudd @dragonfly91 @akshayneema
31+
/src/azure-cli/azure/cli/command_modules/batch/ @jsntcy @yanzhudd @cRui861 @wanghoppe @dpwatrous @wiboris
3232
/src/azure-cli/azure/cli/command_modules/batchai/ @jsntcy @AlexanderYukhanov
3333
/src/azure-cli/azure/cli/command_modules/botservice/ @jsntcy @jiaxuwu2021 @luhan2017
3434
/src/azure-cli/azure/cli/command_modules/cdn/ @jsntcy @kairu-ms @wangzelin007 @necusjz @t-bzhan
@@ -44,8 +44,8 @@
4444
/src/azure-cli/azure/cli/command_modules/extension/ @jsntcy @kairu-ms
4545
/src/azure-cli/azure/cli/command_modules/feedback/ @jiasli @kairu-ms
4646
/src/azure-cli/azure/cli/command_modules/hdinsight/ @kairu-ms @aim-for-better
47-
/src/azure-cli/azure/cli/command_modules/identity/ @zhoxing-ms @jiasli @yanzhudd
48-
/src/azure-cli/azure/cli/command_modules/iot/ @zhoxing-ms @yanzhudd @digimaun
47+
/src/azure-cli/azure/cli/command_modules/identity/ @jiasli @yanzhudd
48+
/src/azure-cli/azure/cli/command_modules/iot/ @yanzhudd @digimaun
4949
/src/azure-cli/azure/cli/command_modules/keyvault/ @notyashhh @jiasli @calvinhzy
5050
/src/azure-cli/azure/cli/command_modules/monitor/ @jsntcy @kairu-ms @necusjz @AllyW
5151
/src/azure-cli/azure/cli/command_modules/mysql/ @calvinhzy @honghr
@@ -56,15 +56,15 @@
5656
/src/azure-cli/azure/cli/command_modules/privatedns/ @jsntcy @kairu-ms @necusjz
5757
/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @bebound
5858
/src/azure-cli/azure/cli/command_modules/rdbms/ @calvinhzy @arde0708 @alanenriqueo
59-
/src/azure-cli/azure/cli/command_modules/resource/ @zhoxing-ms @jsntcy @yanzhudd
59+
/src/azure-cli/azure/cli/command_modules/resource/ @jsntcy @yanzhudd
6060
/src/azure-cli/azure/cli/command_modules/role/ @jiasli @bebound
6161
/src/azure-cli/azure/cli/command_modules/search/ @kairu-ms @necusjz @huangbolun
62-
/src/azure-cli/azure/cli/command_modules/servicebus/ @zhoxing-ms @jsntcy @calvinhzy @v-ajnava
62+
/src/azure-cli/azure/cli/command_modules/servicebus/ @yanzhudd @jsntcy @calvinhzy @v-ajnava
6363
/src/azure-cli/azure/cli/command_modules/serviceconnector/ @kairu-ms @yanzhudd @yungezz @houk-ms @xfz11
64-
/src/azure-cli/azure/cli/command_modules/servicefabric/ @zhoxing-ms @jsntcy @yanzhudd @QingChenmsft
64+
/src/azure-cli/azure/cli/command_modules/servicefabric/ @jsntcy @yanzhudd @QingChenmsft
6565
/src/azure-cli/azure/cli/command_modules/sql/ @calvinhzy @jaredmoo
66-
/src/azure-cli/azure/cli/command_modules/storage/ @jsntcy @zhoxing-ms @calvinhzy
66+
/src/azure-cli/azure/cli/command_modules/storage/ @jsntcy @yanzhudd @calvinhzy
6767
/src/azure-cli/azure/cli/command_modules/synapse/ @jsntcy @idear1203 @zesluo @calvinhzy
68-
/src/azure-cli/azure/cli/command_modules/util/ @jiasli @zhoxing-ms @calvinhzy
69-
/src/azure-cli/azure/cli/command_modules/vm/ @zhoxing-ms @jsntcy @wangzelin007 @yanzhudd @Drewm3 @TravisCragg-MSFT @nikhilpatel909 @sandeepraichura @hilaryw29 @GabstaMSFT @ramankumarlive @ushnaarshadkhan
70-
/src/azure-cli/azure/cli/command_modules/containerapp/ @zhoxing-ms @yanzhudd @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre @ShichaoQiu
68+
/src/azure-cli/azure/cli/command_modules/util/ @jiasli @yanzhudd @calvinhzy
69+
/src/azure-cli/azure/cli/command_modules/vm/ @jsntcy @wangzelin007 @yanzhudd @Drewm3 @TravisCragg-MSFT @nikhilpatel909 @sandeepraichura @hilaryw29 @GabstaMSFT @ramankumarlive @ushnaarshadkhan
70+
/src/azure-cli/azure/cli/command_modules/containerapp/ @yanzhudd @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre @ShichaoQiu

.github/ISSUE_TEMPLATE/Bug_report.yml renamed to .github/ISSUE_TEMPLATE/01_bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: "Bug Report"
2-
description: Use this template to report a bug
1+
name: "🐞 Bug Report"
2+
description: Use this template to report a bug.
33
labels: ["bug"]
44
body:
55
- type: markdown

.github/ISSUE_TEMPLATE/Service_team_request.yml renamed to .github/ISSUE_TEMPLATE/02_feature_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: "[Microsoft Internal / Service Team] Feature Request"
2-
description: Use this template to create a feature request for microsoft internal or service team
1+
name: "✨ Feature Request"
2+
description: Use this template to create a feature request from Microsoft internal or service team.
33
labels: ["feature-request"]
44
body:
55
- type: markdown

.github/ISSUE_TEMPLATE/Feature_request.md renamed to .github/ISSUE_TEMPLATE/03_community_idea.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
name: "\U0001F680Feature request"
3-
about: Suggest an idea for this project
2+
name: "Community Idea"
3+
about: Suggest an idea for this project.
44
title: ''
55
labels: ''
66
assignees: ''

.github/ISSUE_TEMPLATE/docs_feedback.yml renamed to .github/ISSUE_TEMPLATE/04_documentation_issue.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: ✒️ Reference documentation issue or question
2-
description: Report reference documentation related issue
1+
name: Documentation Issue
2+
description: Report reference documentation related issue.
33
title: '[Reference feedback]: '
44
labels: [needs-triage]
55

.github/ISSUE_TEMPLATE/what_if.yml renamed to .github/ISSUE_TEMPLATE/05_what-if_feedback.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: "What-If Feature Issue"
2-
description: Report issues or request enhancements for Azure CLI What-If feature
1+
name: "What-If Feedback"
2+
description: Report issues or request enhancements for What-If feature.
33
labels: ["what-if"]
44
body:
55
- type: markdown

‎linter_exclusions.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3966,6 +3966,9 @@ webapp update:
39663966
force_dns_registration:
39673967
rule_exclusions:
39683968
- option_length_too_long
3969+
platform_release_channel:
3970+
rule_exclusions:
3971+
- option_length_too_long
39693972
skip_custom_domain_verification:
39703973
rule_exclusions:
39713974
- option_length_too_long

‎scripts/ci/credscan/CredScanSuppressions.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,18 @@
683683
"src\\azure-cli\\azure\\cli\\command_modules\\network\\tests\\latest\\test_network_commands.py"
684684
],
685685
"_justification": "[Network] False positive"
686+
},
687+
{
688+
"placeholder": "asdfghjkl",
689+
"_justification": "[ARO] Dummy client_secret value in test_validators.py unit tests"
690+
},
691+
{
692+
"placeholder": "secret_123",
693+
"_justification": "[ARO] Dummy client_secret value in test_validators.py unit tests"
694+
},
695+
{
696+
"placeholder": "client_id_456",
697+
"_justification": "[ARO] Dummy client_id value in test_validators.py unit tests"
686698
}
687699
]
688700
}

‎src/azure-cli-core/azure/cli/core/tests/test_util.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ def test_proxy_resource_parse(self):
154154
@mock.patch('subprocess.Popen', autospec=True)
155155
def test_open_page_in_browser(self, subprocess_open_mock, webbrowser_open_mock):
156156
platform = sys.platform.lower()
157-
open_page_in_browser('http://foo')
157+
open_page_in_browser("http://foo")
158158
if is_wsl():
159159
subprocess_open_mock.assert_called_once_with(['powershell.exe', '-NoProfile',
160-
'-Command', 'Start-Process "http://foo"'])
160+
'-Command', "Start-Process 'http://foo'"])
161161
elif platform == 'darwin':
162162
subprocess_open_mock.assert_called_once_with(['open', 'http://foo'])
163163
else:

‎src/azure-cli-core/azure/cli/core/util.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,8 +803,9 @@ def open_page_in_browser(url):
803803
try:
804804
# https://learn.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_powershell_exe
805805
# Ampersand (&) should be quoted
806+
safe_url = url.replace("'", "''")
806807
return subprocess.Popen(
807-
['powershell.exe', '-NoProfile', '-Command', 'Start-Process "{}"'.format(url)]).wait()
808+
['powershell.exe', '-NoProfile', '-Command', f"Start-Process '{safe_url}'"]).wait()
808809
except OSError: # WSL might be too old # FileNotFoundError introduced in Python 3
809810
pass
810811
elif platform_name == 'darwin':

0 commit comments

Comments
 (0)