Skip to content

Commit

Permalink
Merge branch 'main' into net-analyzer/new-rules-from-mgmt
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/dotnet/Azure.ClientSdk.Analyzers/Azure.ClientSdk.Analyzers/Descriptors.cs
  • Loading branch information
Mingzhe Huang (from Dev Box) committed Oct 25, 2023
2 parents 15faf32 + ca491bb commit 9c6636c
Show file tree
Hide file tree
Showing 318 changed files with 12,904 additions and 4,060 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
# Eng Sys Tools
###########
/tools/ @azure/azure-sdk-eng
/tools/check-enforcer/ @praveenkuttappan @weshaggard
/tools/code-owners-parser/ @konrad-jamrozik @JimSuplizio
/tools/codeowners-utils/ @JimSuplizio
/tools/github-issues/ @praveenkuttappan @weshaggard
/tools/github-event-processor/ @JimSuplizio @benbp
/tools/github-team-user-store/ @JimSuplizio @weshaggard
Expand Down
1 change: 0 additions & 1 deletion .github/event-processor.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"InitialIssueTriage": "On",
"ManualIssueTriage": "On",
"ServiceAttention": "Off",
"CXPAttention": "Off",
"ManualTriageAfterExternalAssignment": "Off",
"RequireAttentionForNonMilestone": "Off",
"AuthorFeedbackNeeded": "Off",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20230713.2
--version 1.0.0-dev.20231010.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-event-processor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: >
dotnet tool install
Azure.Sdk.Tools.GitHubEventProcessor
--version 1.0.0-dev.20230713.2
--version 1.0.0-dev.20231010.2
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
--global
shell: bash
Expand Down
3 changes: 3 additions & 0 deletions doc/engsys_resource_management.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ If you need the group for a little more time, add/update a tag named `DeleteAfte

*To create long-lived resources:*

NOTE: Resource groups in the playground subscription, if compliant and marked with valid aliases (see below), **will still
be marked for deletion after 30 days.** See the below examples for how to extend this deletion deadline if necessary.

Create a resource group to contain all testing resources. The resource group name should start with your Microsoft alias.
Valid group name examples: `myalias`, `myalias-feature-101-testing`. Your Microsoft account must be
[linked to your Github account](https://repos.opensource.microsoft.com/link).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
| Reference | Package | Source |
|---|---|---|
|Communication Chat|[azure-communication-chat](azure-communication-chat/test)|[Github](github.com)|
|Communication Identity|[azure-communication-identity](azure-communication-identity/test)|[Github](github.com/blob/main/sdk/communication/azure-communication-identity)|
|Communication Network Traversal|[azure-communication-networktraversal](azure-communication-networktraversal/test)|[Github](github.com/blob/main/sdk/communication/azure-communication-networktraversal)|
|Communication Phone Numbers|[azure-communication-phonenumbers](azure-communication-phonenumbers/test)|[Github](github.com)|
|Communication Sms|[azure-communication-sms](azure-communication-sms/test)|[Github](github.com)|
|Resource Management - Communication|[azure-mgmt-communication](azure-mgmt-communication/test)|[Github](github.com)|
| Reference | Package | Source |
|---|---|---|
|Communication Chat|[azure-communication-chat](azure-communication-chat/test)|[GitHub](github.com)|
|Communication Network Traversal|[azure-communication-networktraversal](azure-communication-networktraversal/test)|[GitHub](github.com/blob/main/sdk/communication/azure-communication-networktraversal)|
|Communication Phone Numbers|[azure-communication-phonenumbers](azure-communication-phonenumbers/test)|[GitHub](github.com)|
|Communication Sms|[azure-communication-sms](azure-communication-sms/test)|[GitHub](github.com)|
|Resource Management - Communication|[azure-mgmt-communication](azure-mgmt-communication/test)|[GitHub](github.com)|
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
---
title: Azure service name 4 SDK for Unknown
description: Reference for Azure service name 4 SDK for Unknown
author: github-alias
ms.author: msalias
ms.data: 2022-11-01
ms.topic: reference
ms.devlang: Unknown
ms.service: ms-service
---
# Azure service name 4 SDK for Unknown - preview
## Packages - preview
---
title: Azure service name 4 SDK for Unknown
description: Reference for Azure service name 4 SDK for Unknown
ms.date: 2022-11-01
ms.topic: reference
ms.devlang: Unknown
ms.service: ms-service
---
# Azure service name 4 SDK for Unknown - preview
## Packages - preview
[!INCLUDE [packages](service-name-3-index.md)]
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
| Reference | Package | Source |
|---|---|---|
|Communication Chat|[azure-communication-chat](azure-communication-chat/test)|[Github](github.com)|
|Communication Network Traversal|[azure-communication-networktraversal](azure-communication-networktraversal/test)|[Github](github.com/blob/main/sdk/communication/azure-communication-networktraversal)|
|Communication Phone Numbers|[azure-communication-phonenumbers](azure-communication-phonenumbers/test)|[Github](github.com)|
|Communication Sms|[azure-communication-sms](azure-communication-sms/test)|[Github](github.com)|
|Resource Management - Communication|[azure-mgmt-communication](azure-mgmt-communication/test)|[Github](github.com)|
| Reference | Package | Source |
|---|---|---|
|Communication Chat|[azure-communication-chat](azure-communication-chat/test)|[GitHub](github.com)|
|Communication Network Traversal|[azure-communication-networktraversal](azure-communication-networktraversal/test)|[GitHub](github.com/blob/main/sdk/communication/azure-communication-networktraversal)|
|Communication Phone Numbers|[azure-communication-phonenumbers](azure-communication-phonenumbers/test)|[GitHub](github.com)|
|Communication Sms|[azure-communication-sms](azure-communication-sms/test)|[GitHub](github.com)|
|Resource Management - Communication|[azure-mgmt-communication](azure-mgmt-communication/test)|[GitHub](github.com)|
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
---
title: Azure service name 5 SDK for Unknown
description: Reference for Azure service name 5 SDK for Unknown
ms.date: 2022-11-01
ms.topic: reference
ms.devlang: Unknown
ms.service: ms-service
---
This is testing
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
| Reference | Package | Source |
|---|---|---|
|Communication Chat|[azure-communication-chat](azure-communication-chat/test)|[Github](github.com)|
|Communication Identity|[azure-communication-identity](azure-communication-identity/test)|[Github](github.com/blob/main/sdk/communication/azure-communication-identity)|
|Communication Network Traversal|[azure-communication-networktraversal](azure-communication-networktraversal/test)|[Github](github.com/blob/main/sdk/communication/azure-communication-networktraversal)|
|Communication Phone Numbers|[azure-communication-phonenumbers](azure-communication-phonenumbers/test)|[Github](github.com)|
|Communication Sms|[azure-communication-sms](azure-communication-sms/test)|[Github](github.com)|
|Resource Management - Communication|[azure-mgmt-communication](azure-mgmt-communication/test)|[Github](github.com)|
| Reference | Package | Source |
|---|---|---|
|Communication Chat|[azure-communication-chat](azure-communication-chat/test)|[GitHub](github.com)|
|Communication Network Traversal|[azure-communication-networktraversal](azure-communication-networktraversal/test)|[GitHub](github.com/blob/main/sdk/communication/azure-communication-networktraversal)|
|Communication Phone Numbers|[azure-communication-phonenumbers](azure-communication-phonenumbers/test)|[GitHub](github.com)|
|Communication Sms|[azure-communication-sms](azure-communication-sms/test)|[GitHub](github.com)|
|Resource Management - Communication|[azure-mgmt-communication](azure-mgmt-communication/test)|[GitHub](github.com)|
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
---
title: Azure service name 6 SDK for Unknown
description: Reference for Azure service name 6 SDK for Unknown
author: github-alias
ms.author: msalias
ms.data: 2022-11-01
ms.topic: reference
ms.devlang: Unknown
ms.service: ms-service
---
# Azure service name 6 SDK for Unknown - preview
## Packages - preview
---
title: Azure service name 6 SDK for Unknown
description: Reference for Azure service name 6 SDK for Unknown
ms.date: 2022-11-01
ms.topic: reference
ms.devlang: Unknown
ms.service: ms-service
---
# Azure service name 6 SDK for Unknown - preview
## Packages - preview
[!INCLUDE [packages](service-name-5-index.md)]
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
title: Azure service name 2 SDK for Unknown
description: Reference for Azure service name 2 SDK for Unknown
author: github-alias
ms.author: msalias
ms.data: 2022-11-01
ms.date: 2022-11-01
ms.topic: reference
ms.devlang: Unknown
ms.service: ms-service
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
title: Azure service name 4 SDK for Unknown
description: Reference for Azure service name 4 SDK for Unknown
author: github-alias
ms.author: msalias
ms.data: 2022-11-01
ms.date: 2022-11-01
ms.topic: reference
ms.devlang: Unknown
ms.service: ms-service
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
title: Azure service name 1 SDK for Unknown
description: Reference for Azure service name 1 SDK for Unknown
author: github-alias
ms.author: msalias
ms.data: 2022-11-01
ms.date: 2022-11-01
ms.topic: reference
ms.devlang: Unknown
ms.service: ms-service
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
title: Azure service name 3 SDK for Unknown
description: Reference for Azure service name 3 SDK for Unknown
author: github-alias
ms.author: msalias
ms.data: 2022-11-01
ms.date: 2022-11-01
ms.topic: reference
ms.devlang: Unknown
ms.service: ms-service
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
title: Azure service name 5 SDK for Unknown
description: Reference for Azure service name 5 SDK for Unknown
author: github-alias
ms.author: msalias
ms.data: 2022-11-01
ms.date: 2022-11-01
ms.topic: reference
ms.devlang: Unknown
ms.service: ms-service
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
---
title: Azure service name 6 SDK for Unknown
description: Reference for Azure service name 6 SDK for Unknown
author: github-alias
ms.author: msalias
ms.data: 2022-11-01
ms.date: 2022-11-01
ms.topic: reference
ms.devlang: Unknown
ms.service: ms-service
Expand Down
46 changes: 0 additions & 46 deletions eng/common-tests/get-codeowners/get-codeowners.tests.ps1

This file was deleted.

4 changes: 3 additions & 1 deletion eng/common/TestResources/New-TestResources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,6 @@ try {
-TemplateParameterObject $templateFileParameters `
-Force:$Force
}

if ($deployment.ProvisioningState -ne 'Succeeded') {
Write-Host "Deployment '$($deployment.DeploymentName)' has state '$($deployment.ProvisioningState)' with CorrelationId '$($deployment.CorrelationId)'. Exiting..."
Write-Host @'
Expand Down Expand Up @@ -803,6 +802,9 @@ try {
Write-Verbose "Removing compiled bicep file $($templateFile.jsonFilePath)"
Remove-Item $templateFile.jsonFilePath
}

Write-Host "Deleting ARM deployment as it may contain secrets. Deployed resources will not be affected."
$null = $deployment | Remove-AzResourceGroupDeployment
}

} finally {
Expand Down
5 changes: 4 additions & 1 deletion eng/common/TestResources/Update-TestResources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ param (
[string] $SubscriptionId,

[Parameter()]
[ValidateRange(1, 7*24)]
[ValidateRange(1, 30*24)]
[int] $DeleteAfterHours = 48
)

Expand Down Expand Up @@ -136,6 +136,9 @@ try {

Log "Updating DeleteAfter to '$deleteAfter'"
Write-Warning "Any clean-up scripts running against subscription '$SubscriptionId' may delete resource group '$ResourceGroupName' after $DeleteAfterHours hours."
if (!$resourceGroup.Tags) {
$resourceGroup.Tags = @{}
}
$resourceGroup.Tags['DeleteAfter'] = $deleteAfter

Log "Updating resource group '$ResourceGroupName'"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ steps:
if ((!"$(System.PullRequest.SourceBranch)".StartsWith("sync-eng/common")) -and "$(System.PullRequest.TargetBranch)" -match "^(refs/heads/)?$(DefaultBranch)$")
{
$filesInCommonDir = & "eng/common/scripts/get-changedfiles.ps1" -DiffPath 'eng/common/*'
$filesInCommonDir = & "eng/common/scripts/get-changedfiles.ps1" -DiffPath 'eng/common/*' -DiffFilterType ""
if (($LASTEXITCODE -eq 0) -and ($filesInCommonDir.Count -gt 0))
{
Write-Host "##vso[task.LogIssue type=error;]Changes to files under 'eng/common' directory should not be made in this Repo`n${filesInCommonDir}"
Expand All @@ -21,7 +21,7 @@ steps:
}
if ((!"$(System.PullRequest.SourceBranch)".StartsWith("sync-.github/workflows")) -and "$(System.PullRequest.TargetBranch)" -match "^(refs/heads/)?$(DefaultBranch)$")
{
$filesInCommonDir = & "eng/common/scripts/get-changedfiles.ps1" -DiffPath '.github/workflows/*'
$filesInCommonDir = & "eng/common/scripts/get-changedfiles.ps1" -DiffPath '.github/workflows/*' -DiffFilterType ""
if (($LASTEXITCODE -eq 0) -and ($filesInCommonDir.Count -gt 0))
{
Write-Host "##vso[task.LogIssue type=error;]Changes to files under '.github/workflows' directory should not be made in this Repo`n${filesInCommonDir}"
Expand All @@ -30,4 +30,4 @@ steps:
}
}
displayName: Prevent changes to eng/common and .github/workflows outside of azure-sdk-tools repo
condition: and(succeeded(), ne(variables['Skip.EngCommonWorkflowEnforcer'], 'true'), not(endsWith(variables['Build.Repository.Name'], '-pr')))
condition: and(succeeded(), ne(variables['Skip.EngCommonWorkflowEnforcer'], 'true'), not(endsWith(variables['Build.Repository.Name'], '-pr')))
16 changes: 12 additions & 4 deletions eng/common/pipelines/templates/steps/sparse-checkout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ steps:
- checkout: none

- task: PowerShell@2
displayName: 'Sparse checkout repositories'
${{ if eq(length(parameters.Repositories), 1) }}:
displayName: 'Sparse checkout ${{ parameters.Repositories[0].Name }}'
${{ else }}:
displayName: 'Sparse checkout repositories'
inputs:
targetType: inline
# Define this inline, because of the chicken/egg problem with loading a script when nothing
Expand All @@ -29,7 +32,7 @@ steps:
if (!$dir) {
$dir = "./$($repository.Name)"
}
New-Item $dir -ItemType Directory -Force
New-Item $dir -ItemType Directory -Force | Out-Null
Push-Location $dir
if (Test-Path .git/info/sparse-checkout) {
Expand Down Expand Up @@ -70,9 +73,14 @@ steps:
# sparse-checkout commands after initial checkout will auto-checkout again
if (!$hasInitialized) {
Write-Host "git -c advice.detachedHead=false checkout $($repository.Commitish)"
# Remove refs/heads/ prefix from branch names
$commitish = $repository.Commitish -replace '^refs/heads/', ''
# use -- to prevent git from interpreting the commitish as a path
Write-Host "git -c advice.detachedHead=false checkout $commitish --"
# This will use the default branch if repo.Commitish is empty
git -c advice.detachedHead=false checkout $($repository.Commitish)
git -c advice.detachedHead=false checkout $commitish --
} else {
Write-Host "Skipping checkout as repo has already been initialized"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,7 @@ steps:
-Language '${{parameters.Language}}' `
-RepoId '${{ parameters.RepoId }}' `
-DocValidationImageId '${{ parameters.DocValidationImageId }}' `
-PackageSourceOverride '${{ parameters.PackageSourceOverride }}' `
-TenantId '$(opensource-aad-tenant-id)' `
-ClientId '$(opensource-aad-app-id)' `
-ClientSecret '$(opensource-aad-secret)'
-PackageSourceOverride '${{ parameters.PackageSourceOverride }}'
displayName: Apply Documentation Updates
- template: /eng/common/pipelines/templates/steps/git-push-changes.yml
Expand Down
Loading

0 comments on commit 9c6636c

Please sign in to comment.