Merge pull request #22465 from yifanz7/mergestoragepreview

[Do Not Squash][Az.Storage] Merge latest changes from main to Az.Storage-preview

Author: YanaXu

.azure-pipelines/code-oob.yml

@@ -1,23 +1,23 @@
 parameters:
-- name: TargetBranch
-  displayName: Branch this module will generated to
-  type: string
-  default: main
 - name: ServiceName
-  displayName: Service to OOB release
+  displayName: OOB release Service
   type: string
   default: Databricks
 - name: Preview
-  displayName: Is preview version
+  displayName: Is preview version? (version is "x.y.z-preview" or major version is 0)
   type: boolean
   default: false
+variables:
+  BumpUpBranch: none
 stages:
 - stage: OOBRelease
   displayName: OOBRelease
   jobs:
-  - job: OOBRelease
+  - job: BumpUpVersion
     timeoutInMinutes: 180
     pool: pool-windows-2019
+    variables:
+      NeedBumpUp: true
     steps:
     - task: DotNetCoreCLI@2
       displayName: Build
@@ -28,43 +28,26 @@ stages:
     - pwsh: |
           .\tools\RunVersionController.ps1 -ModuleName "Az.${{ parameters.ServiceName }}”
       displayName: 'Bump up version'
-    - task: AzurePowerShell@5
-      inputs:
-          azureSubscription: '$(AzureSubscription)'
-          ScriptType: 'InlineScript'
-          azurePowerShellVersion: 'LatestVersion'
-          inline: |
-              Set-AzContext -Tenant $(TenantId) -SubscriptionId $(SubscriptionId)
-              $Token = Get-AzKeyVaultSecret -VaultName $(KeyVaultName) -Name $(KeyVaultAccount) -AsPlainText
-              git config user.email "[email protected]"
-              git config user.name "azure-powershell-bot"
-              git checkout -b codeoob/${{ parameters.ServiceName }}
-              git add -A
-              if (${{ parameters.Preview }} -eq $true) {
-                git reset -- ./tools/Tools.Common/SerializedCmdlets/Az.${{ parameters.ServiceName }}.json
-              }
-              git commit -m "Bump up version for ${{ parameters.ServiceName }}"
-              git remote set-url origin https://azure-powershell-bot:[email protected]/Azure/azure-powershell.git;
-              git push origin codeoob/${{ parameters.ServiceName }} --force;
-              $Title = "Migrate ${{ parameters.ServiceName }} from oob to main"
-              $HeadBranch = "codeoob/${{ parameters.ServiceName }}"
-              $BaseBranch = "${{ parameters.TargetBranch }}"
-              $Description = "Migrate ${{ parameters.ServiceName }} from oob to ${{parameters.TargetBranch}}"
-              ./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $Token -Description $Description -Draft $true
-      displayName: Create PR to main branch
     - task: PowerShell@2
       displayName: get changelog info
+      name: outputinfo
       inputs:
         targetType: 'inline'
         script: |
           $readme = Get-ChildItem -Path "./src/${{ parameters.ServiceName }}" -name ChangeLog.md -Recurse
           $mdContent = Get-Content -Path "src/${{ parameters.ServiceName }}/$readme" -Raw
           $pattern = '(?s)## Version (\d+\.\d+\.\d)+[\s\S]*?\n(.*?)(?=\n## Version \d+\.\d+\.\d+|$)'
           $matches = [regex]::Match($mdcontent, $pattern)
+          $NeedBumpUp = $true
           if ($matches.Success) {
               $versionNumber = $matches.Groups[1].Value
               $versionChanges = $matches.Groups[2].Value.Trim()
           }
+          if ($${{ parameters.Preview }} -and ([version]$versionNumber -ge [version]"1.0.0")) {
+            $versionNumber += "-preview"
+            echo "##vso[task.setvariable variable=NeedBumpUp]false"
+            $NeedBumpUp = $false
+          }
           $jsonData = @{
             ModuleName = "${{ parameters.ServiceName }}"
             VersionNumber = "$versionNumber"
@@ -99,6 +82,40 @@ stages:
           $readmePath = "OOB/README.md"
           $content | Out-File -FilePath $readmePath
 
+          if ($NeedBumpUp) {
+              echo "##vso[task.setvariable variable=BumpUpBranch;isOutput=true]$(BranchPrefix)/${{ parameters.ServiceName }}"
+
+          } else {
+              echo "##vso[task.setvariable variable=BumpUpBranch;isOutput=true]none"
+          }
+    - task: AzurePowerShell@5
+      inputs:
+          azureSubscription: '$(AzureSubscription)'
+          ScriptType: 'InlineScript'
+          azurePowerShellVersion: 'LatestVersion'
+          inline: |
+              Set-AzContext -Tenant $(TenantId) -SubscriptionId $(SubscriptionId)
+              $Token = Get-AzKeyVaultSecret -VaultName $(KeyVaultName) -Name $(KeyVaultAccount) -AsPlainText
+              git config user.email "$(GithubEmail)"
+              git config user.name "$(GithubUsername)"
+              git checkout -b $(BranchPrefix)/${{ parameters.ServiceName }}
+              git add -A ':!OOB'
+              if ($${{ parameters.Preview }}) {
+                git reset -- ./tools/Tools.Common/SerializedCmdlets/Az.${{ parameters.ServiceName }}.json
+              }
+              git commit -m "Bump up version for ${{ parameters.ServiceName }}"
+              git remote set-url origin https://azure-powershell-bot:[email protected]/Azure/azure-powershell.git;
+              git push origin $(BranchPrefix)/${{ parameters.ServiceName }} --force;
+              $Title = "${{ parameters.ServiceName }} OOB Release"
+              $HeadBranch = "$(BranchPrefix)/${{ parameters.ServiceName }}"
+              $BaseBranch = "$(Build.SourceBranch)"
+              $BaseBranch = $BaseBranch.Replace("refs/heads/", "")
+              $Description = "${{ parameters.ServiceName }} OOB Release"
+              ./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $Token -Description $Description -Draft $true
+      displayName: Create PR to main branch
+      condition: and(succeeded(), eq(variables['NeedBumpUp'], 'true'))
+
+
     - task: PowerShell@2
       displayName: publish oob tools
       inputs:
@@ -112,11 +129,13 @@ stages:
         PathtoPublish: OOB
         ArtifactName: OOB
 - stage: Codesign
+  variables:
+    BumpUpBranch: $[stageDependencies.OOBRelease.BumpUpVersion.outputs['outputinfo.BumpUpBranch']]
   dependsOn: OOBRelease
   jobs:
   - template: ./code-sign.yml
     parameters:
-      OOBBranch: codeoob/${{ parameters.ServiceName }}
+      OOBBranch: $(BumpUpBranch)
   - job: PulishForTest
     dependsOn: Release
     steps:
@@ -148,7 +167,4 @@ stages:
           $moduleName = $jsonObject.ModuleName
           $context = New-AzStorageContext -StorageAccountName "$(TestStorageAccountName)"
           $package = Get-Item "$(System.ArtifactsDirectory)/artifacts/Az.$moduleName.$versionNumber.nupkg"
-          $package | Set-AzStorageBlobContent -Container "public" -Context $context -Force
-
-
-
+          $package | Set-AzStorageBlobContent -Container "public" -Context $context -Force

.azure-pipelines/code-sign.yml

@@ -17,10 +17,11 @@ jobs:
     inputs:
       targetType: 'inline'
       script: |
-          git remote set-url origin https://azure-powershell-bot:[email protected]/Azure/azure-powershell.git;
-          git fetch origin
-          git checkout -b ${{ parameters.OOBBranch }} origin/${{ parameters.OOBBranch }}
-    condition: and(succeeded(), ne('${{ parameters.OOBBranch }}', 'none'))
+          if ('${{ parameters.OOBBranch }}' -ne 'none') {
+            git remote set-url origin https://azure-powershell-bot:[email protected]/Azure/azure-powershell.git;
+            git fetch origin
+            git checkout -b ${{ parameters.OOBBranch }} origin/${{ parameters.OOBBranch }}
+          }
   - pwsh: 'Install-Module platyPS -Force -Confirm:$false -Scope CurrentUser'
     displayName: 'Install platyPS'
 

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 # To make sure Network PRs go to the right branch, e.g. network-april
-/src/Network/    @MikhailTryakhov @htippanaboya
+/src/Network/    @Joanna-Yang-Art @htippanaboya
 /src/Compute/    @bilaakpan-ms @sandido @haagha @grizzlytheodore
 /src/PolicyInsights/  @pilor
 

.github/fabricbot.json

@@ -1635,25 +1635,25 @@
           {
             "labels": [
               "Service Attention",
-              "Consumption- RIandShowBack"
+              "Consumption - Billing"
             ],
             "mentionees": [
-              "ccmshowbackdevs"
+              "ccmbpxpcrew"
             ]
           },
           {
             "labels": [
               "Service Attention",
-              "Consumption-Billing"
+              "Consumption - Budget"
             ],
             "mentionees": [
-              "ccmbpxpcrew"
+              "ccmaxpcrew"
             ]
           },
           {
             "labels": [
               "Service Attention",
-              "Consumption-Budget"
+              "Consumption - Consumption"
             ],
             "mentionees": [
               "ccmaxpcrew"
@@ -1662,28 +1662,28 @@
           {
             "labels": [
               "Service Attention",
-              "Consumption-Consumption"
+              "Consumption - Query"
             ],
             "mentionees": [
-              "ccmaxpcrew"
+              "ccmixpdevs"
             ]
           },
           {
             "labels": [
               "Service Attention",
-              "Consumption-Query"
+              "Consumption - UsageDetailsandExport"
             ],
             "mentionees": [
-              "ccmixpdevs"
+              "TiagoCrewGitHubIssues"
             ]
           },
           {
             "labels": [
               "Service Attention",
-              "Consumption-UsageDetailsandExport"
+              "Consumption- RIandShowBack"
             ],
             "mentionees": [
-              "TiagoCrewGitHubIssues"
+              "ccmshowbackdevs"
             ]
           },
           {
@@ -1751,7 +1751,7 @@
           {
             "labels": [
               "Service Attention",
-              "Cost Management-Billing"
+              "Cost Management - Billing"
             ],
             "mentionees": [
               "ccmbpxpcrew"
@@ -1760,7 +1760,7 @@
           {
             "labels": [
               "Service Attention",
-              "Cost Management-Budget"
+              "Cost Management - Budget"
             ],
             "mentionees": [
               "ccmaxpcrew"
@@ -1769,7 +1769,7 @@
           {
             "labels": [
               "Service Attention",
-              "Cost Management-Query"
+              "Cost Management - Query"
             ],
             "mentionees": [
               "ccmixpdevs"
@@ -1778,7 +1778,7 @@
           {
             "labels": [
               "Service Attention",
-              "Cost Management-RIandShowBack"
+              "Cost Management - RIandShowBack"
             ],
             "mentionees": [
               "ccmshowbackdevs"
@@ -1787,7 +1787,7 @@
           {
             "labels": [
               "Service Attention",
-              "Cost Management-UsageDetailsAndExport"
+              "Cost Management - UsageDetailsAndExport"
             ],
             "mentionees": [
               "TiagoCrewGitHubIssues"
@@ -2847,7 +2847,7 @@
               "Security"
             ],
             "mentionees": [
-              "chlahav"
+              "zivraf"
             ]
           },
           {

.github/workflows/pr-labeled.yml

@@ -0,0 +1,20 @@
+name: pr-labeled
+run-name: Triggered by pr label
+env:
+  GH_TOKEN: ${{ github.token }}
+  PR: ${{ github.event.pull_request.html_url }}
+on:
+  pull_request:
+    types:
+      - labeled
+jobs:
+  process_labels:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        sparse-checkout: |
+          .github
+    - name: process label
+      shell: pwsh
+      run: .github/workflows/script/PrLabeled.ps1 -LabelName "${{ github.event.label.name }}" -PrUrl $env:PR

.github/workflows/script/PrLabeled.ps1

@@ -0,0 +1,65 @@
+param(
+    [System.String]
+    $LabelName,
+    [System.String]
+    $PrUrl
+)
+Write-Host "Processing PR $PrUrl with label $LabelName"
+
+$CommentDict = @{
+    "DO NOT SQUASH :no_entry_sign:" = @"
+‼️ Please merge this PR with commits! You can enable this option in the setting page.
+‼️ Remember close that option after merging this PR!
+"@
+    "Do Not Merge :no_entry_sign:" = @"
+‼️ DO NOT MERGE THIS PR ‼️
+"@
+    "Breaking Change Release" = @"
+To PR author,
+This PR was labeled "Breaking Change Release" because it contains breaking changes.
+According to our [policy](https://eng.ms/docs/cloud-ai-platform/azure-core/azure-management-and-platforms/control-plane-bburns/azure-cli-tools-azure-cli-powershell-and-terraform/azure-cli-tools/devguide/azps/breaking-change/breaking-changes-policy), breaking changes can only take place during major release and must be preannounced.
+Please follow our [guide](https://eng.ms/docs/cloud-ai-platform/azure-core/azure-management-and-platforms/control-plane-bburns/azure-cli-tools-azure-cli-powershell-and-terraform/azure-cli-tools/devguide/azps/breaking-change/breaking-changes-process) on the detailed steps.
+"@
+    "needs-revision" = @"
+This PR was labeled "needs-revision" because it has unresolved review comments or CI failures.
+Please resolve all open review comments and make sure all CI checks are green. Refer to our guide (link TBD) to troubleshoot common CI failures.
+"@
+}
+
+
+function Test-LabelCommentIsAlreadyAdded {
+    param(
+        [System.String]
+        $Comment,
+        [System.String]
+        $PrUrl
+    )
+    $existingComments = (gh pr view $PrUrl --json comments | ConvertFrom-Json).comments | Where-Object { $_.body -eq $comment }
+    if ($existingComments.Count -gt 0) {
+        return $true
+    }
+    return $false
+}
+
+function Get-Comment {
+    param(
+        [System.String]
+        $LabelName
+    )
+    if ($CommentDict.ContainsKey($LabelName)) {
+        return $CommentDict[$LabelName]
+    }
+    return $null
+}
+
+if ($CommentDict.ContainsKey($LabelName)) {
+    $comment = Get-Comment -LabelName $LabelName
+    Write-Host "Try to add comment: $comment"
+    $isCommentAlreadyAdded = Test-LabelCommentIsAlreadyAdded -Comment $comment -PrUrl $PrUrl
+    if ($isCommentAlreadyAdded) {
+        Write-Host "Comment is already added"
+    }
+    else {
+        gh pr comment $PrUrl --body $comment
+    }
+}