Skip to content

Commit abc3488

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into credential_handler_with_1es_sdk
2 parents 2fd426a + e9d2a53 commit abc3488

File tree

1,936 files changed

+1413543
-890226
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,936 files changed

+1413543
-890226
lines changed

.azure-pipelines/breaking-change-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
fetchTags: true
2323
persistCredentials: true
2424
- task: UsePythonVersion@0
25-
displayName: 'Use Python 3.10'
25+
displayName: 'Use Python 3.11'
2626
inputs:
27-
versionSpec: 3.10
27+
versionSpec: 3.11
2828
- template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/azdev_setup.yml
2929
- bash: |
3030
set -ev

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
/src/azure-cli/azure/cli/command_modules/container/ @joseph-porter
3737
/src/azure-cli/azure/cli/command_modules/cosmosdb/ @dmakwana @kristynhamasaki @evelyn-ys @calvinhzy
3838
/src/azure-cli/azure/cli/command_modules/databoxedge/ @evelyn-ys
39-
/src/azure-cli/azure/cli/command_modules/dls/ @akharit @rahuldutta90 @jsntcy
39+
/src/azure-cli/azure/cli/command_modules/dls/ @akharit @rahuldutta90 @jsntcy @yonzhan @evelyn-ys
4040
/src/azure-cli/azure/cli/command_modules/dms/ @temandr @binuj
4141
/src/azure-cli/azure/cli/command_modules/eventgrid/ @evelyn-ys @VidyaKukke
4242
/src/azure-cli/azure/cli/command_modules/eventhubs/ @v-ajnava
@@ -46,7 +46,7 @@
4646
/src/azure-cli/azure/cli/command_modules/identity/ @zhoxing-ms @jiasli @yanzhudd
4747
/src/azure-cli/azure/cli/command_modules/iot/ @digimaun @zhoxing-ms @yanzhudd
4848
/src/azure-cli/azure/cli/command_modules/keyvault/ @evelyn-ys @jiasli @calvinhzy
49-
/src/azure-cli/azure/cli/command_modules/monitor/ @jsntcy @kairu-ms @necusjz
49+
/src/azure-cli/azure/cli/command_modules/monitor/ @jsntcy @kairu-ms @necusjz @AllyW
5050
/src/azure-cli/azure/cli/command_modules/mysql/ @honghr @evelyn-ys
5151
/src/azure-cli/azure/cli/command_modules/natgateway/ @khannarheams @jsntcy @kairu-ms @necusjz
5252
/src/azure-cli/azure/cli/command_modules/network/ @jsntcy @kairu-ms @wangzelin007 @necusjz

.github/azure-client-tools-bot/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
similar_issue: true
1+
similar_issue: false
22
allowed_branches:
33
- "dev"
44
auto_choose_milestone:

.github/policies/resourceManagement.yml

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,8 +1410,8 @@ configuration:
14101410
then:
14111411
- mentionUsers:
14121412
mentionees:
1413-
- AnatoliB
1414-
- Francisco-Gamino
1413+
- kamperiadis
1414+
- khkh-ms
14151415
- shreyabatra4
14161416
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
14171417
assignMentionees: False
@@ -3219,10 +3219,16 @@ configuration:
32193219
- payloadType: Issues
32203220
- or:
32213221
- titleContains:
3222-
pattern: '[Aa]z \b(account|group|resource|provider|feature|tag|policy|lock|managedapp|resourcemanagement)\b'
3222+
pattern: '[Aa]z \b(group|resource|provider|feature|tag|policy|lock|managedapp|resourcemanagement)\b'
32233223
isRegex: True
32243224
- bodyContains:
3225-
pattern: '[Aa]z \b(account|group|resource|provider|feature|tag|policy|lock|managedapp|resourcemanagement)\b'
3225+
pattern: '[Aa]z \b(group|resource|provider|feature|tag|policy|lock|managedapp|resourcemanagement)\b'
3226+
isRegex: True
3227+
- titleContains:
3228+
pattern: '[Aa]z account (lock|management-group)\b'
3229+
isRegex: True
3230+
- bodyContains:
3231+
pattern: '[Aa]z account (lock|management-group)\b'
32263232
isRegex: True
32273233
- or:
32283234
- isAction:
@@ -3240,6 +3246,31 @@ configuration:
32403246
- addLabel:
32413247
label: question
32423248
description: '[arm] auto assign labels and users based on issue description.'
3249+
- if:
3250+
- payloadType: Issues
3251+
- or:
3252+
- titleContains:
3253+
pattern: '[Aa]z account\b(?!\s+(lock|management-group)\b)'
3254+
isRegex: True
3255+
- bodyContains:
3256+
pattern: '[Aa]z account\b(?!\s+(lock|management-group)\b)'
3257+
isRegex: True
3258+
- or:
3259+
- isAction:
3260+
action: Opened
3261+
then:
3262+
- addLabel:
3263+
label: Auto-Assign
3264+
- addLabel:
3265+
label: ARM
3266+
- assignTo:
3267+
users:
3268+
- jiasli
3269+
- addLabel:
3270+
label: Azure CLI Team
3271+
- addLabel:
3272+
label: question
3273+
description: '[arm] auto assign labels and users based on issue description. '
32433274
- if:
32443275
- payloadType: Issues
32453276
- or:
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Hi, this inquiry has been well received albeit being triaged as non-security related ask.
2+
3+
Azure CLI is currently prioritizing direct SFI requirements and items and this request does not seem to be related to SFI. We'll retain it in our backlog at this point. Please reach out to [email protected] if you'd justify it's highly customer-impacted and need to be escalated.
4+
5+
Thank you,
6+
7+
Azure CLI team
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Comment Issue when labeled non-security
2+
on:
3+
issues:
4+
types: [opened, labeled, unlabeled]
5+
6+
jobs:
7+
comment-non-security:
8+
if: contains(github.event.issue.labels.*.name, 'non-security')
9+
runs-on: ubuntu-20.04
10+
permissions:
11+
issues: write
12+
name: Comment on issue
13+
steps:
14+
- name: Checkout comment message
15+
uses: actions/checkout@v4
16+
with:
17+
sparse-checkout: |
18+
.github/template/non-security-comment.md
19+
- name: Comment on issue with no security label
20+
uses: mshick/add-pr-comment@v2
21+
with:
22+
repo-token: ${{ secrets.GITHUB_TOKEN }}
23+
message-id: issueNoSecurityCommentBot
24+
message-path: |
25+
.github/template/non-security-comment.md
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Run issue sentinel
2+
on:
3+
issues:
4+
types: [opened, edited, closed]
5+
6+
jobs:
7+
Issue:
8+
permissions:
9+
issues: write
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Run Issue Sentinel
13+
uses: Azure/issue-sentinel@v1
14+
with:
15+
password: ${{secrets.ISSUE_SENTINEL_PASSWORD}}
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Trigger Microsoft Learn Docs Reference CI
2+
3+
on:
4+
release:
5+
types:
6+
- released
7+
8+
permissions:
9+
id-token: write
10+
11+
jobs:
12+
RunAzurePipeline:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Azure Login
16+
uses: Azure/[email protected]
17+
with:
18+
client-id: ${{ secrets.ADO_DocsReference_SP_ClientID }}
19+
tenant-id: ${{ secrets.ADO_DocsReference_SP_TenantID }}
20+
allow-no-subscriptions: true
21+
22+
- name: Run Azure Pipeline
23+
shell: pwsh
24+
env:
25+
AdoOrg: ${{secrets.ADO_DocsReference_Organization}}
26+
AdoProject: ${{secrets.ADO_DocsReference_Project}}
27+
AdoPipelineId: ${{secrets.ADO_DocsReference_JumpPipeline_ID}}
28+
CheckInterval: 60
29+
run: |
30+
$organization = $env:AdoOrg
31+
$project = $env:AdoProject
32+
$definitionId = $env:AdoPipelineId
33+
$checkInterval = $env:CheckInterval
34+
$thisRunLink = "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
35+
$triggerBranch = 'main'
36+
$variables = @('commitAuthor=azcli', 'triggerFromRepo=https://github.com/Azure/azure-cli', "triggerBranch=$triggerBranch", "triggerByPipeline=$thisRunLink")
37+
38+
$output = az pipelines build queue --definition-id $definitionId --project $project --organization $organization --variables @variables | ConvertFrom-Json -AsHashtable
39+
if ($? -eq $false)
40+
{
41+
$pipelineDefinitionLink = $organization + [uri]::EscapeDataString($project) + "/_build?definitionId=$definitionId"
42+
Write-Error "Failed to queue the pipeline run for $pipelineDefinitionLink, please check above error message."
43+
}
44+
$runIdInJumpPipeline = $output.id
45+
Write-Host "runIdInJumpPipeline: $runIdInJumpPipeline"
46+
do
47+
{
48+
Start-Sleep -Seconds $checkInterval
49+
$status = az pipelines runs show --query status --id $runIdInJumpPipeline --project $project --organization $organization --output tsv
50+
$currentTime = (Get-Date -AsUTC).ToString('yyyy-MM-dd HH:mm:ss')
51+
Write-Host "[UTC $currentTime] apidrop shared jump pipeline run status: $status"
52+
} while ($status -ne 'completed')
53+
$jumpOutput = az pipelines runs show --id $runIdInJumpPipeline --project $project --organization $organization | ConvertFrom-Json -AsHashtable
54+
55+
$targetPipelineResult = ($jumpOutput.tags -Match 'jump_return_result_(canceled|failed|partiallySucceeded|succeeded)')[0] -replace 'jump_return_result_', ''
56+
$runId = ($jumpOutput.tags -Match 'jump_return_id_\d+')[0] -replace 'jump_return_id_', ''
57+
$triggeredTargetPipeline = $runId ? $true : $false
58+
if ($triggeredTargetPipeline)
59+
{
60+
# apidrop shared jump pipeline triggered target pipeline
61+
$printMessage = 'Triggered reference pipeline run'
62+
$printMessage += $targetPipelineResult ? " with its result $targetPipelineResult" : '' # waited for completion or not
63+
}
64+
else
65+
{
66+
# apidrop shared jump pipeline may fail to trigger target pipeline
67+
$runId = $runIdInJumpPipeline
68+
$printMessage = "Jump pipeline run with $($jumpOutput.result) state may fail to trigger reference pipeline"
69+
}
70+
$runLink = $organization + [uri]::EscapeDataString($project) + "/_build/results?buildId=$runId"
71+
$printMessage += ", for details please check: $runLink"
72+
if ($triggeredTargetPipeline)
73+
{
74+
Write-Host $printMessage
75+
}
76+
else
77+
{
78+
Write-Error $printMessage
79+
}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,5 @@ pip.log
117117

118118
az_command_coverage.txt
119119

120+
#cmd coverage
121+
cmd_coverage/*

alpine.dockerfile

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)