Skip to content

Commit 333bc80

Browse files
committed
Merge branch 'dev' into whatif
2 parents 9b1d254 + ad66d3b commit 333bc80

File tree

1,942 files changed

+2446962
-1529239
lines changed

Some content is hidden

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

1,942 files changed

+2446962
-1529239
lines changed

.devcontainer/.env

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
AAZ_CLI_PATH=/workspaces/azure-cli
2+
AAZ_CLI_EXTENSION_PATH=/workspaces/azure-cli-extensions
3+
AAZ_SWAGGER_PATH=/workspaces/azure-rest-api-specs
4+
AAZ_PATH=/workspaces/aaz

.devcontainer/devcontainer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
"cpus": 16,
1414
"memory": "64gb",
1515
"storage": "128gb"
16-
}
16+
},
17+
"runArgs": ["--env-file", ".devcontainer/.env"],
1718
}

.devcontainer/init.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ source .venv/bin/activate
44
# Logout default account
55
export GITHUB_TOKEN=
66

7-
# Check `repo` scope exists or not
8-
if gh auth status -a 2>/dev/null | grep "Token scopes: " | grep -q "repo"; then
9-
echo "You now have access to GitHub."
10-
else
11-
gh auth login -p https -w
7+
if [[ $- == *i* ]]; then # Interactive shell only
8+
# Check `repo` scope exists or not
9+
if gh auth status -a 2>/dev/null | grep "Token scopes: " | grep -q "repo"; then
10+
echo "You now have access to GitHub."
11+
else
12+
gh auth login -p https -w
13+
fi
1214
fi
1315

1416
# Check `aaz-dev` is available or not
@@ -66,9 +68,7 @@ if ! command -v aaz-dev &> /dev/null; then
6668
ELAPSED_TIME=$SECONDS
6769

6870
echo -e "\n${YELLOW}Elapsed time: $((ELAPSED_TIME / 60))m $((ELAPSED_TIME % 60))s.${NC}"
69-
echo -e "\n${GREEN}Finished setup! Please launch the codegen tool via:${NC}"
70-
echo -e "${GREEN}\$ aaz-dev run -c azure-cli -e azure-cli-extensions -s azure-rest-api-specs -a aaz${NC}\n"
71+
echo -e "\n${GREEN}Finished setup! Please launch the codegen tool via: aaz-dev run${NC}\n"
7172
else
72-
echo -e "\nPlease launch the codegen tool via:"
73-
echo -e "$ aaz-dev run -c azure-cli -e azure-cli-extensions -s azure-rest-api-specs -a aaz\n"
73+
echo -e "\nPlease launch the codegen tool via: aaz-dev run\n"
7474
fi

.devcontainer/mcp.json

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,10 @@
11
{
2-
"inputs": [
3-
{
4-
"type": "promptString",
5-
"id": "extension_or_module_name",
6-
"description": "The name of the Azure CLI extension or module to generate commands for."
7-
},
8-
{
9-
"type": "promptString",
10-
"id": "swagger_module_path",
11-
"description": "The file path to the Swagger module."
12-
},
13-
{
14-
"type": "promptString",
15-
"id": "resource_provider",
16-
"description": "The Azure resource provider for which to generate commands."
17-
},
18-
{
19-
"type": "promptString",
20-
"id": "swagger_tag",
21-
"description": "The Swagger tag to use for command generation."
22-
}
23-
],
242
"servers": {
253
"AAZ Flow": {
264
"command": "python",
275
"args": [
28-
"azure-cli/tools/aaz-flow/main.py"
6+
"azure-cli/tools/aaz-flow/src/aaz-flow/main.py"
297
],
30-
"env": {
31-
"AAZ_PATH": "/workspaces/aaz",
32-
"CLI_PATH": "/workspaces/azure-cli",
33-
"CLI_EXTENSION_PATH": "/workspaces/azure-cli-extensions",
34-
"SWAGGER_PATH": "/workspaces/azure-rest-api-specs"
35-
}
368
}
379
}
38-
}
10+
}

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/linter_exclusions.yml @jsntcy @kairu-ms @zhoxing-ms
88

9-
/doc/ @jiasli @kairu-ms @jsntcy
9+
/doc/ @jiasli @kairu-ms @jsntcy @necusjz @yanzhudd
1010
/tools/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
1111
/tools/aaz-flow @a0x1ab @necusjz @yanzhudd
1212
/scripts/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
@@ -24,7 +24,7 @@
2424
/src/azure-cli/azure/cli/command_modules/acs/ @zhoxing-ms @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
27+
/src/azure-cli/azure/cli/command_modules/appconfig/ @zhoxing-ms @jsntcy @yanzhudd @ChristineWanjau @albertofori @avanigupta @mrm9084
2828
/src/azure-cli/azure/cli/command_modules/appservice/ @jsntcy @zhoxing-ms @yanzhudd @panchagnula
2929
/src/azure-cli/azure/cli/command_modules/aro/ @jsntcy @bennerv @hawkowl @jewzaam @rogbas
3030
/src/azure-cli/azure/cli/command_modules/backup/ @zhoxing-ms @jsntcy @yanzhudd @dragonfly91 @akshayneema

.github/ISSUE_TEMPLATE/what_if.yml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: "What-If Feature Issue"
2+
description: Report issues or request enhancements for Azure CLI What-If feature
3+
labels: ["what-if"]
4+
body:
5+
- type: markdown
6+
id: intro
7+
attributes:
8+
value: |
9+
Thank you for reporting an issue related to preview of changes (--what-if) or export to Bicep (--export-bicep) with az cli! Please provide as much detail as possible.
10+
11+
- type: dropdown
12+
id: issue-type
13+
attributes:
14+
label: Issue Type
15+
description: What type of issue are you reporting?
16+
options:
17+
- Bug Report
18+
- Feature Request
19+
- Documentation Issue
20+
validations:
21+
required: true
22+
23+
- type: textarea
24+
id: description
25+
attributes:
26+
label: Description
27+
description: Provide a clear description of the issue or feature request
28+
placeholder: Describe what happened or what you'd like to see
29+
validations:
30+
required: true
31+
32+
- type: textarea
33+
id: command
34+
attributes:
35+
label: Command or Script
36+
description: Provide the command or script that helps reproducing or demonstrate the issue
37+
placeholder: |
38+
- az vm create --what-if --export-bicep
39+
- N/A if not applicable
40+
render: shell
41+
validations:
42+
required: true
43+
44+
- type: textarea
45+
id: expected
46+
attributes:
47+
label: Expected Behavior
48+
description: What did you expect to happen?
49+
placeholder: |
50+
- Describe the expected outcome
51+
- N/A if not applicable
52+
validations:
53+
required: true
54+
55+
- type: textarea
56+
id: actual
57+
attributes:
58+
label: Actual Behavior
59+
description: What actually happened?
60+
placeholder: |
61+
- Describe what actually occurred
62+
- N/A if not applicable
63+
validations:
64+
required: true
65+
66+
- type: textarea
67+
id: environment
68+
attributes:
69+
label: Environment
70+
description: Provide environment details
71+
placeholder: |
72+
- OS: Windows 11 / Ubuntu 22.04 / macOS 14
73+
- Tool Version: Azure CLI 2.80.0
74+
- Python Version: 3.12.10
75+
- N/A if not applicable
76+
validations:
77+
required: true
78+
79+
- type: textarea
80+
id: additional
81+
attributes:
82+
label: Additional Context
83+
description: Add any other context, screenshots, or logs
84+
placeholder: Any additional information that might be helpful
85+
validations:
86+
required: false

.github/policies/resourceManagement.yml

Lines changed: 68 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,17 @@ configuration:
636636
- us6193
637637
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
638638
assignMentionees: False
639+
- if:
640+
- hasLabel:
641+
label: Service Attention
642+
- hasLabel:
643+
label: Blob Storage SFTP
644+
then:
645+
- mentionUsers:
646+
mentionees:
647+
- greeshma-microsoft
648+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
649+
assignMentionees: False
639650
- if:
640651
- hasLabel:
641652
label: Service Attention
@@ -1433,7 +1444,7 @@ configuration:
14331444
then:
14341445
- mentionUsers:
14351446
mentionees:
1436-
- rgreenMSFT
1447+
- amarjeetkr
14371448
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
14381449
assignMentionees: False
14391450
- if:
@@ -1546,6 +1557,21 @@ configuration:
15461557
- nberdy
15471558
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
15481559
assignMentionees: False
1560+
- if:
1561+
- hasLabel:
1562+
label: Service Attention
1563+
- hasLabel:
1564+
label: Device Registry
1565+
then:
1566+
- mentionUsers:
1567+
mentionees:
1568+
- c-ryan-k
1569+
- digimaun
1570+
- rohankhandelwal
1571+
- mryanlo
1572+
- atastrophic
1573+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
1574+
assignMentionees: False
15491575
- if:
15501576
- hasLabel:
15511577
label: Service Attention
@@ -1567,7 +1593,6 @@ configuration:
15671593
- mentionUsers:
15681594
mentionees:
15691595
- anishtrakru
1570-
- derekbekoe
15711596
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
15721597
assignMentionees: False
15731598
- if:
@@ -1578,7 +1603,7 @@ configuration:
15781603
then:
15791604
- mentionUsers:
15801605
mentionees:
1581-
- sourabhguha
1606+
- YingXue
15821607
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
15831608
assignMentionees: False
15841609
- if:
@@ -1628,6 +1653,17 @@ configuration:
16281653
- Saglodha
16291654
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
16301655
assignMentionees: False
1656+
- if:
1657+
- hasLabel:
1658+
label: Service Attention
1659+
- hasLabel:
1660+
label: Fabric
1661+
then:
1662+
- mentionUsers:
1663+
mentionees:
1664+
- xinzhizou
1665+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
1666+
assignMentionees: False
16311667
- if:
16321668
- hasLabel:
16331669
label: Service Attention
@@ -1647,9 +1683,9 @@ configuration:
16471683
then:
16481684
- mentionUsers:
16491685
mentionees:
1650-
- AnatoliB
1651-
- Francisco-Gamino
1652-
- shreyabatra4
1686+
- kamperiadis
1687+
- amamounelsayed
1688+
- khkh-ms
16531689
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
16541690
assignMentionees: False
16551691
- if:
@@ -1744,20 +1780,8 @@ configuration:
17441780
then:
17451781
- mentionUsers:
17461782
mentionees:
1747-
- iluican
1748-
- jlian
1749-
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
1750-
assignMentionees: False
1751-
- if:
1752-
- hasLabel:
1753-
label: Service Attention
1754-
- hasLabel:
1755-
label: IotDPS
1756-
then:
1757-
- mentionUsers:
1758-
mentionees:
1759-
- iluican
1760-
- jlian
1783+
- digimaun
1784+
- Azure/azure-iot-cli-triage
17611785
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
17621786
assignMentionees: False
17631787
- if:
@@ -2713,8 +2737,11 @@ configuration:
27132737
then:
27142738
- mentionUsers:
27152739
mentionees:
2716-
- shariq-mcs
2717-
- MSFTeegarden
2740+
- abhijitch_microsoft
2741+
- yuvalm_microsoft
2742+
- nikitagarg_microsoft
2743+
- sanar_microsoft
2744+
- cawa_microsoft
27182745
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
27192746
assignMentionees: False
27202747
- if:
@@ -2827,10 +2854,10 @@ configuration:
28272854
then:
28282855
- mentionUsers:
28292856
mentionees:
2830-
- bleroy
2831-
- tjacobhi
2832-
- markheff
2833-
- miwelsh
2857+
- kuanlu95
2858+
- efrainretana
2859+
- mattgotteiner
2860+
- Draconicida
28342861
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
28352862
assignMentionees: False
28362863
- if:
@@ -2853,6 +2880,7 @@ configuration:
28532880
- mentionUsers:
28542881
mentionees:
28552882
- nazang
2883+
- mooshc
28562884
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
28572885
assignMentionees: False
28582886
- if:
@@ -3063,6 +3091,20 @@ configuration:
30633091
- S-J-M
30643092
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
30653093
assignMentionees: False
3094+
- if:
3095+
- hasLabel:
3096+
label: Service Attention
3097+
- hasLabel:
3098+
label: StorageDiscovery
3099+
then:
3100+
- mentionUsers:
3101+
mentionees:
3102+
- shanefujs
3103+
- apurv2304
3104+
- skallurk
3105+
- vdziunms
3106+
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
3107+
assignMentionees: False
30663108
- if:
30673109
- hasLabel:
30683110
label: Service Attention

0 commit comments

Comments
 (0)