Skip to content

Commit 4792e98

Browse files
authored
Merge branch 'Azure:dev' into weiliu2/set_default_empty
2 parents a807914 + d4cc7ec commit 4792e98

3,496 files changed

Lines changed: 1709444 additions & 3376235 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.

.azure-pipelines/sync-alias.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,14 @@ resources:
1414
type: git
1515
name: internal.wiki
1616

17+
variables:
18+
- template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/variables.yml
19+
1720
jobs:
1821
- job: UpdateYaml
1922
displayName: Update resourceManagement.yml
20-
pool: pool-windows-2019
23+
pool:
24+
name: ${{ variables.windows_pool }}
2125
uses:
2226
repositories:
2327
- ServiceContactList
@@ -71,14 +75,14 @@ jobs:
7175
git add .github/policies
7276
git commit -m "Sync resourceManagement.yml"
7377
74-
git remote set-url origin https://azclibot:$(GithubToken)@github.com/Azure/azure-cli.git;
75-
git push origin "sync_alias_$env:Build_BuildId" --force
78+
git remote add azclibot https://azclibot:$(GithubToken)@github.com/azclibot/azure-cli.git
79+
git push azclibot "sync_alias_$env:Build_BuildId" --force
7680
displayName: Git commit and push
7781
condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))
7882
7983
- pwsh: |
8084
$Title = "{CI} Sync resourceManagement.yml according To ADO Wiki Page - Service Contact List"
81-
$HeadBranch = "sync_alias_$env:Build_BuildId"
85+
$HeadBranch = "azclibot:sync_alias_$env:Build_BuildId"
8286
$BaseBranch = "dev"
8387
$Description = "This PR synchronizes the task: 'Triage issues to the service team' part of resourceManagement.yml from table of Service Contact List in ADO wiki page"
8488
@@ -88,5 +92,5 @@ jobs:
8892
8993
Invoke-WebRequest -Uri $Uri -Method POST -Headers $Headers -Body ($RequestBody | ConvertTo-Json)
9094
91-
displayName: Create PR to dev branch
95+
displayName: Create PR to azure/azure-cli dev branch
9296
condition: and(succeeded(), eq(variables['ChangesDetected'], 'true'))
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variables:
2-
ubuntu_pool: 'pool-ubuntu-2004'
3-
ubuntu_multi_core_pool: 'pool-ubuntu-2004-multi-core'
2+
ubuntu_pool: 'pool-ubuntu-2204'
3+
ubuntu_multi_core_pool: 'pool-ubuntu-latest-multi-core'
44
windows_pool: 'pool-windows-2019'
5-
ubuntu_arm64_pool: 'ubuntu-arm64-2004-pool'
5+
ubuntu_arm64_pool: 'pool-ubuntu-latest-arm64'
66
macos_pool: 'macOS-14'

.githooks/pre-commit

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
#!/usr/bin/env sh
2-
":" //; if command -v pwsh >/dev/null 2>&1; then pwsh -ExecutionPolicy Bypass -File .githooks/pre-commit.ps1; else sh .githooks/pre-commit.sh; fi; exit $? # Try PowerShell Core first, then sh on Unix
3-
":" //; exit # Skip rest on Unix
42

5-
@echo off
6-
powershell -NoProfile -Command "if (Get-Command powershell -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"
7-
if %errorlevel% equ 0 (
8-
powershell -ExecutionPolicy Bypass -File .githooks\pre-commit.ps1
9-
) else (
10-
echo Error: PowerShell is not available. Please install PowerShell.
11-
exit /b 1
12-
)
13-
exit /b %errorlevel%
3+
# Check if running in Windows
4+
if [ -n "$COMSPEC" ]; then
5+
# Windows section - Execute directly with PowerShell
6+
powershell -NoProfile -Command "
7+
if (Get-Command powershell -ErrorAction SilentlyContinue) {
8+
Write-Host 'PowerShell found, executing pre-commit.ps1...'
9+
powershell -ExecutionPolicy Bypass -File '.githooks\pre-commit.ps1'
10+
exit $LASTEXITCODE
11+
} else {
12+
Write-Host 'Error: PowerShell is not available. Please install PowerShell.'
13+
exit 1
14+
}
15+
"
16+
echo "Exiting with status $?"
17+
exit $?
18+
else
19+
# Unix-like system section
20+
echo "Unix-like system found, executing pre-commit.sh..."
21+
sh .githooks/pre-commit.sh
22+
echo "Exiting with status $?"
23+
exit $?
24+
fi

.githooks/pre-push

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
#!/usr/bin/env sh
2-
":" //; if command -v pwsh >/dev/null 2>&1; then pwsh -ExecutionPolicy Bypass -File .githooks/pre-push.ps1; else sh .githooks/pre-push.sh; fi; exit $? # Try PowerShell Core first, then sh on Unix
3-
":" //; exit # Skip rest on Unix
42

5-
@echo off
6-
powershell -NoProfile -Command "if (Get-Command powershell -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"
7-
if %errorlevel% equ 0 (
8-
powershell -ExecutionPolicy Bypass -File .githooks\pre-push.ps1
9-
) else (
10-
echo Error: PowerShell is not available. Please install PowerShell.
11-
exit /b 1
12-
)
13-
exit /b %errorlevel%
3+
# Check if running in Windows
4+
if [ -n "$COMSPEC" ]; then
5+
# Windows section - Execute directly with PowerShell
6+
powershell -NoProfile -Command "
7+
if (Get-Command powershell -ErrorAction SilentlyContinue) {
8+
Write-Host 'PowerShell found, executing pre-push.ps1...'
9+
powershell -ExecutionPolicy Bypass -File '.githooks\pre-push.ps1'
10+
exit $LASTEXITCODE
11+
} else {
12+
Write-Host 'Error: PowerShell is not available. Please install PowerShell.'
13+
exit 1
14+
}
15+
"
16+
echo "Exiting with status $?"
17+
exit $?
18+
else
19+
# Unix-like system section
20+
echo "Unix-like system found, executing pre-push.sh..."
21+
sh .githooks/pre-push.sh
22+
echo "Exiting with status $?"
23+
exit $?
24+
fi

.githooks/pre-push.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ if ($mergeBase -ne $upstreamHead) {
4545
Write-Host "Would you like to automatically rebase and setup? [Y/n]" -ForegroundColor Yellow
4646

4747
try {
48-
$reader = [System.IO.StreamReader]::new("CON")
49-
$input = $reader.ReadLine()
48+
$input = Read-Host
49+
if ([string]::IsNullOrEmpty($input)) {
50+
$input = "Y"
51+
}
5052
} catch {
5153
Write-Host "Error reading input. Aborting push..." -ForegroundColor Red
5254
exit 1

.github/CODEOWNERS

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,62 +7,62 @@
77
/linter_exclusions.yml @jsntcy @kairu-ms @zhoxing-ms
88

99
/doc/ @jiasli @kairu-ms @jsntcy
10-
/tools/ @kairu-ms @jiasli @wangzelin007 @calvinhzy
10+
/tools/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
1111
/scripts/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
1212
/scripts/live_test @kairu-ms @wangzelin007
13-
/src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms @wangzelin007
13+
/src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms @wangzelin007 @bebound
1414

1515
/src/azure-cli-core/ @jiasli @evelyn-ys @jsntcy @kairu-ms @zhoxing-ms @calvinhzy @necusjz @bebound
16-
/src/azure-cli-core/azure/cli/core/_profile.py @jiasli @evelyn-ys @calvinhzy @bebound
17-
/src/azure-cli-core/azure/cli/core/auth/ @jiasli @evelyn-ys @calvinhzy @bebound
16+
/src/azure-cli-core/azure/cli/core/_profile.py @jiasli @evelyn-ys @bebound
17+
/src/azure-cli-core/azure/cli/core/auth/ @jiasli @evelyn-ys @bebound
1818
/src/azure-cli-core/azure/cli/core/extension/ @jsntcy @kairu-ms
1919
/src/azure-cli-core/azure/cli/core/style.py @jiasli @evelyn-ys @zhoxing-ms
2020
/src/azure-cli-core/azure/cli/core/aaz/ @kairu-ms @necusjz @calvinhzy @jsntcy
2121

2222
/src/azure-cli/azure/cli/command_modules/acr/ @zhoxing-ms @northtyphoon @rosanch @jsntcy @yanzhudd
2323
/src/azure-cli/azure/cli/command_modules/acs/ @zhoxing-ms @zqingqing1 @gtracer @xizhamsft @andyliuliming @fumingzhang @jsntcy @yanzhudd
24-
/src/azure-cli/azure/cli/command_modules/advisor/ @Prasanna-Padmanabhan
25-
/src/azure-cli/azure/cli/command_modules/apim/ @kevinhillinger @jonlester
26-
/src/azure-cli/azure/cli/command_modules/appconfig/ @ChristineWanjau @albertofori @avanigupta @zhoxing-ms @jsntcy @yanzhudd
27-
/src/azure-cli/azure/cli/command_modules/appservice/ @panchagnula @jsntcy @zhoxing-ms @yanzhudd
28-
/src/azure-cli/azure/cli/command_modules/aro/ @bennerv @hawkowl @jewzaam @rogbas
29-
/src/azure-cli/azure/cli/command_modules/backup/ @dragonfly91 @zhoxing-ms @akshayneema @jsntcy @yanzhudd
30-
/src/azure-cli/azure/cli/command_modules/batch/ @cRui861 @wanghoppe @dpwatrous @wiboris @zhoxing-ms @jsntcy @yanzhudd
31-
/src/azure-cli/azure/cli/command_modules/batchai/ @AlexanderYukhanov
32-
/src/azure-cli/azure/cli/command_modules/botservice/ @jiaxuwu2021 @luhan2017
24+
/src/azure-cli/azure/cli/command_modules/advisor/ @jsntcy @Prasanna-Padmanabhan
25+
/src/azure-cli/azure/cli/command_modules/apim/ @jsntcy @kevinhillinger @jonlester
26+
/src/azure-cli/azure/cli/command_modules/appconfig/ @zhoxing-ms @jsntcy @yanzhudd @ChristineWanjau @albertofori @avanigupta
27+
/src/azure-cli/azure/cli/command_modules/appservice/ @jsntcy @zhoxing-ms @yanzhudd @panchagnula
28+
/src/azure-cli/azure/cli/command_modules/aro/ @jsntcy @bennerv @hawkowl @jewzaam @rogbas
29+
/src/azure-cli/azure/cli/command_modules/backup/ @zhoxing-ms @jsntcy @yanzhudd @dragonfly91 @akshayneema
30+
/src/azure-cli/azure/cli/command_modules/batch/ @zhoxing-ms @jsntcy @yanzhudd @cRui861 @wanghoppe @dpwatrous @wiboris
31+
/src/azure-cli/azure/cli/command_modules/batchai/ @jsntcy @AlexanderYukhanov
32+
/src/azure-cli/azure/cli/command_modules/botservice/ @jsntcy @jiaxuwu2021 @luhan2017
3333
/src/azure-cli/azure/cli/command_modules/cdn/ @jsntcy @kairu-ms @wangzelin007 @necusjz @t-bzhan
3434
/src/azure-cli/azure/cli/command_modules/cloud/ @jiasli @evelyn-ys
35-
/src/azure-cli/azure/cli/command_modules/consumption/ @sandeepnl
36-
/src/azure-cli/azure/cli/command_modules/container/ @joseph-porter
37-
/src/azure-cli/azure/cli/command_modules/cosmosdb/ @dmakwana @kristynhamasaki @evelyn-ys @calvinhzy
35+
/src/azure-cli/azure/cli/command_modules/consumption/ @jsntcy @sandeepnl
36+
/src/azure-cli/azure/cli/command_modules/container/ @jsntcy @joseph-porter
37+
/src/azure-cli/azure/cli/command_modules/cosmosdb/ @evelyn-ys @calvinhzy @dmakwana @kristynhamasaki
3838
/src/azure-cli/azure/cli/command_modules/databoxedge/ @evelyn-ys
39-
/src/azure-cli/azure/cli/command_modules/dls/ @akharit @rahuldutta90 @jsntcy @yonzhan @evelyn-ys
40-
/src/azure-cli/azure/cli/command_modules/dms/ @temandr @binuj
39+
/src/azure-cli/azure/cli/command_modules/dls/ @jsntcy @evelyn-ys @akharit @rahuldutta90
40+
/src/azure-cli/azure/cli/command_modules/dms/ @jsntcy @temandr @binuj
4141
/src/azure-cli/azure/cli/command_modules/eventgrid/ @evelyn-ys @VidyaKukke
42-
/src/azure-cli/azure/cli/command_modules/eventhubs/ @v-ajnava
42+
/src/azure-cli/azure/cli/command_modules/eventhubs/ @jsntcy @v-ajnava
4343
/src/azure-cli/azure/cli/command_modules/extension/ @jsntcy @kairu-ms
4444
/src/azure-cli/azure/cli/command_modules/feedback/ @jiasli @kairu-ms
45-
/src/azure-cli/azure/cli/command_modules/hdinsight/ @aim-for-better @kairu-ms
45+
/src/azure-cli/azure/cli/command_modules/hdinsight/ @kairu-ms @aim-for-better
4646
/src/azure-cli/azure/cli/command_modules/identity/ @zhoxing-ms @jiasli @yanzhudd
47-
/src/azure-cli/azure/cli/command_modules/iot/ @digimaun @zhoxing-ms @yanzhudd
47+
/src/azure-cli/azure/cli/command_modules/iot/ @zhoxing-ms @yanzhudd @digimaun
4848
/src/azure-cli/azure/cli/command_modules/keyvault/ @evelyn-ys @jiasli @calvinhzy
4949
/src/azure-cli/azure/cli/command_modules/monitor/ @jsntcy @kairu-ms @necusjz @AllyW
50-
/src/azure-cli/azure/cli/command_modules/mysql/ @honghr @evelyn-ys
51-
/src/azure-cli/azure/cli/command_modules/natgateway/ @khannarheams @jsntcy @kairu-ms @necusjz
50+
/src/azure-cli/azure/cli/command_modules/mysql/ @evelyn-ys @honghr
51+
/src/azure-cli/azure/cli/command_modules/natgateway/ @jsntcy @kairu-ms @necusjz @khannarheams
5252
/src/azure-cli/azure/cli/command_modules/network/ @jsntcy @kairu-ms @wangzelin007 @necusjz
53-
/src/azure-cli/azure/cli/command_modules/policyinsights/ @cheggert
53+
/src/azure-cli/azure/cli/command_modules/policyinsights/ @jsntcy @cheggert
5454
/src/azure-cli/azure/cli/command_modules/privatedns/ @jsntcy @kairu-ms @necusjz
55-
/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys @calvinhzy @bebound
56-
/src/azure-cli/azure/cli/command_modules/rdbms/ @arde0708 @evelyn-ys @calvinhzy @alanenriqueo
55+
/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys @bebound
56+
/src/azure-cli/azure/cli/command_modules/rdbms/ @evelyn-ys @calvinhzy @arde0708 @alanenriqueo
5757
/src/azure-cli/azure/cli/command_modules/resource/ @zhoxing-ms @jsntcy @yanzhudd
58-
/src/azure-cli/azure/cli/command_modules/role/ @jiasli @evelyn-ys @calvinhzy @bebound
59-
/src/azure-cli/azure/cli/command_modules/search/ @huangbolun @kairu-ms
60-
/src/azure-cli/azure/cli/command_modules/servicebus/ @v-ajnava @zhoxing-ms @jsntcy @evelyn-ys
61-
/src/azure-cli/azure/cli/command_modules/serviceconnector/ @yungezz @houk-ms @xfz11 @yanzhudd @kairu-ms
62-
/src/azure-cli/azure/cli/command_modules/servicefabric/ @QingChenmsft @zhoxing-ms @jsntcy @yanzhudd
63-
/src/azure-cli/azure/cli/command_modules/sql/ @jaredmoo @evelyn-ys @calvinhzy
58+
/src/azure-cli/azure/cli/command_modules/role/ @jiasli @evelyn-ys @bebound
59+
/src/azure-cli/azure/cli/command_modules/search/ @kairu-ms @huangbolun
60+
/src/azure-cli/azure/cli/command_modules/servicebus/ @zhoxing-ms @jsntcy @evelyn-ys @v-ajnava
61+
/src/azure-cli/azure/cli/command_modules/serviceconnector/ @kairu-ms @yanzhudd @yungezz @houk-ms @xfz11
62+
/src/azure-cli/azure/cli/command_modules/servicefabric/ @zhoxing-ms @jsntcy @yanzhudd @QingChenmsft
63+
/src/azure-cli/azure/cli/command_modules/sql/ @evelyn-ys @calvinhzy @jaredmoo
6464
/src/azure-cli/azure/cli/command_modules/storage/ @jsntcy @zhoxing-ms @evelyn-ys @calvinhzy
6565
/src/azure-cli/azure/cli/command_modules/synapse/ @jsntcy @idear1203 @zesluo @evelyn-ys
6666
/src/azure-cli/azure/cli/command_modules/util/ @jiasli @zhoxing-ms @evelyn-ys
6767
/src/azure-cli/azure/cli/command_modules/vm/ @zhoxing-ms @jsntcy @wangzelin007 @yanzhudd @Drewm3 @TravisCragg-MSFT @nikhilpatel909 @sandeepraichura @hilaryw29 @GabstaMSFT @ramankumarlive @ushnaarshadkhan
68-
/src/azure-cli/azure/cli/command_modules/containerapp/ @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14 @Greedygre
68+
/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
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: GH Azdev Setup
2+
description: 'azdev env setup'
3+
4+
runs:
5+
using: 'composite'
6+
steps:
7+
- name: Check Init GH Event
8+
env:
9+
action: ${{ toJSON(github.event.action) }}
10+
label: ${{ toJSON(github.event.label) }}
11+
shell: bash
12+
run: |
13+
echo start azdev env setup
14+
- name: Checkout CLI repo
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0 # checkout all branches
18+
ref: ${{ github.event.pull_request.head.ref }}
19+
repository: ${{ github.event.pull_request.head.repo.full_name }} # checkout pull request branch
20+
- name: Set up Python 3.12
21+
uses: actions/setup-python@v3
22+
with:
23+
python-version: "3.12"
24+
- name: Install azdev
25+
shell: bash
26+
run: |
27+
python -m pip install --upgrade pip
28+
set -ev
29+
python -m venv env
30+
chmod +x env/bin/activate
31+
source ./env/bin/activate
32+
pip install azdev
33+
azdev --version
34+
cd ../
35+
azdev setup -c azure-cli --debug
36+
az --version
37+
pip list -v

0 commit comments

Comments
 (0)