Merge branch 'Azure:main' into anapandey/bicepExport

Author: anamikapan

.azure-pipelines/PipelineSteps/BatchGeneration/filter.ps1

@@ -15,7 +15,7 @@ $artifactsDir = Join-Path $RepoRoot 'artifacts'
 
 $changedModulesDict = @{}
 $changedSubModulesDict = @{}
-if ($env:TEST_CHANGED_MODULES_ONLY -eq "True") {
+if ($env:TEST_CHANGED_MODULES_ONLY -eq 'true') {
     Write-Host "Run test on generated folder changed modules"
     # Only generated folder change should trigger the test
     for ($i = 0; $i -lt $ChangedFiles.Count; $i++) {

.azure-pipelines/PipelineSteps/BatchGeneration/notify-failed-job.ps1

@@ -15,7 +15,10 @@ $notificationContent = $notificationTemplate -replace "{{ pipelineName }}", $pip
                                             -replace "{{ pipelineUrl }}", $pipelineUrl `
                                             -replace "{{ runUrl }}", $runUrl
 
+$notificationReceivers = if ($env:NotificationReceiversOverride -and $env:NotificationReceiversOverride -ne 'none') { $env:NotificationReceiversOverride } else { $env:FailedJobNotificationReceivers }
+Write-Host "Notification receivers: $notificationReceivers"
+
 Send-Teams `
-    -to $env:FailedJobNotificationReceivers `
+    -to $notificationReceivers `
     -title "Batch Generation Job Failed" `
     -content $notificationContent

.azure-pipelines/PipelineSteps/BatchGeneration/util.psm1

@@ -3,6 +3,15 @@ function Get-BatchGenerationModuleMap {
         [string]$srcPath
     )
     $skippedModules = $env:SKIPPED_MODULES -split ',' | ForEach-Object { $_.Trim() }
+    $selectedTargetModules = @{}
+    if ($env:SELECTED_TARGET_MODULES -ne "none") {
+        $env:SELECTED_TARGET_MODULES -split ',' | ForEach-Object {
+            $key = $_.Trim()
+            if ($key -ne '') {
+                $selectedTargetModules[$key] = $true
+            }
+        }
+    }
     $result = @{}
     $modules = Get-ChildItem -Path $srcPath -Directory
 
@@ -11,6 +20,12 @@ function Get-BatchGenerationModuleMap {
             Write-Warning "Skipping module: $($module.Name) as it is in the skipped modules list."
             continue
         }
+
+        if ($selectedTargetModules.Count -gt 0 -and -not $selectedTargetModules.ContainsKey($module.Name)) {
+            Write-Warning "Skipping module: $($module.Name) as it is not in the selected target modules list."
+            continue
+        }
+
         $subModules = Get-ChildItem -Path $module.FullName -Directory | Where-Object { 
             $_.Name -like '*.autorest'
         }

.azure-pipelines/batch-generation.yml

@@ -1,8 +1,21 @@
 parameters:
 - name: TestChangedModulesOnly
-  displayName: 'Only run tests on modules that are changed by regeneration'
+  type: boolean
+  default: true
+# Selected modules to generate, build, analyze and test
+- name: SelectedTargetModules
   type: string
-  default: 'True'
+  default: 'None'
+- name: NotificationReceiversOverride
+  type: string
+  default: 'None'
+# branch from when creating the generation branch
+- name: GenerationBaseBranch
+  type: string
+  default: 'main'
+- name: PrepareModulesOnGenerationBranch
+  type: boolean
+  default: false
 
 variables:
   IntermediateStepTimeoutInMinutes: 30
@@ -39,6 +52,22 @@ stages:
       pool: ${{ variables.WindowsAgentPoolName }}
       steps:
 
+      - task: PowerShell@2
+        name: showVariables
+        displayName: 'Show Variables'
+        inputs:
+          targetType: inline
+          pwsh: true
+          script: |
+            Write-Host "Pipeline variable SkippedModules: $($env:SkippedModules)"
+            Write-Host "Pipeline variable FailedJobNotificationReceivers: $($env:FailedJobNotificationReceivers)"
+
+            Write-Host "Parameter TestChangedModulesOnly: ${{ parameters.TestChangedModulesOnly }}"
+            Write-Host "Parameter SelectedTargetModules: ${{ parameters.SelectedTargetModules }}"
+            Write-Host "Parameter NotificationReceiversOverride: ${{ parameters.NotificationReceiversOverride }}"
+            Write-Host "Parameter GenerationBaseBranch: ${{ parameters.GenerationBaseBranch }}"
+            Write-Host "Parameter PrepareModulesOnGenerationBranch: ${{ parameters.PrepareModulesOnGenerationBranch }}"
+
       # TODO: (Bernard) Uncomment the no checkout step after automatically install repo into agents 
       # - checkout: none
       - checkout: self
@@ -59,7 +88,7 @@ stages:
             $token = "$(GitHubToken)"
 
             $createBranchPath = Join-Path "$(Build.SourcesDirectory)" '.azure-pipelines' 'PipelineSteps' 'BatchGeneration' 'create-branch.ps1'
-            & $createBranchPath -Owner 'Azure' -Repo 'azure-powershell' -BaseBranch "$(GenerationBaseBranch)" -NewBranch $generationBranch -Token $token
+            & $createBranchPath -Owner 'Azure' -Repo 'azure-powershell' -BaseBranch "${{ parameters.GenerationBaseBranch }}" -NewBranch $generationBranch -Token $token
             Write-Host "##vso[task.setvariable variable=GenerationBranch;isOutput=true]$generationBranch"
 
       - task: PowerShell@2
@@ -82,10 +111,18 @@ stages:
           targetType: inline
           pwsh: true
           script: |
+            if ($env:PREPARE_MODULES_ON_GENERATION_BRANCH -eq 'true') {
+              Write-Host "Checkout to GenerationBranch: $(checkout.GenerationBranch)"
+              git fetch origin "$(checkout.GenerationBranch)"
+              git checkout "$(checkout.GenerationBranch)"
+            }
+
             $prepareModulesPath = Join-Path "$(Build.SourcesDirectory)" '.azure-pipelines' 'PipelineSteps' 'BatchGeneration' 'prepare.ps1'
             & $prepareModulesPath -RepoRoot "$(Build.SourcesDirectory)" -MaxParallelJobs "${{ variables.MaxParallelGenerateJobs }}"
         env:
           SKIPPED_MODULES: $(SkippedModules)
+          SELECTED_TARGET_MODULES: ${{ parameters.SelectedTargetModules }}
+          PREPARE_MODULES_ON_GENERATION_BRANCH: ${{ parameters.PrepareModulesOnGenerationBranch }}
 
       - task: PublishPipelineArtifact@1
         displayName: 'Upload generated targets'
@@ -515,3 +552,4 @@ stages:
             env:
               TEAMS_URL: $(TEAMS_URL)
               FailedJobNotificationReceivers: $(FailedJobNotificationReceivers)
+              NotificationReceiversOverride: ${{ parameters.NotificationReceiversOverride }}

.github/policies/resourceManagement.yml

@@ -4071,6 +4071,25 @@ configuration:
             - xgithubtriage
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
+      - if:
+        - or:
+          - labelAdded:
+              label: Service Attention
+          - labelAdded:
+              label: Storage Action
+        - hasLabel:
+            label: Service Attention
+        - hasLabel:
+            label: Storage Action
+        then:
+        - mentionUsers:
+            mentionees:
+            - blueww
+            - sshankMSFT
+            - golddove
+            - S-J-M
+            replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
+            assignMentionees: False
       - if:
         - or:
           - labelAdded:

NuGet.Config

@@ -28,6 +28,10 @@
 
 
 
+
+
+
+
 
 
 

generated/AppConfiguration/AppConfigurationData.Autorest/Az.AppConfigurationData.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <PsModuleName>AppConfigurationdata</PsModuleName>
     <PsRootModuleName>AppConfiguration</PsRootModuleName>
-    <PsModuleFolder>AppConfigurationData.Autorest</PsModuleFolder>
+    <PsModuleFolder>AppConfigurationdata.Autorest</PsModuleFolder>
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., build.proj))\src\Az.autorest.props" />

generated/AppConfiguration/AppConfigurationData.Autorest/Properties/AssemblyInfo.cs

@@ -1,28 +1,26 @@
-// ----------------------------------------------------------------------------------
-//
-// Copyright Microsoft Corporation
-// Licensed under the Apache License, Version 2.0 (the "License");
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the ""License"");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 // http://www.apache.org/licenses/LICENSE-2.0
 // Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
+// distributed under the License is distributed on an ""AS IS"" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// ----------------------------------------------------------------------------------
+// Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
+// is regenerated.
 
 using System;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("Microsoft Azure Powershell - AppConfigurationData")]
-[assembly: AssemblyCompany(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCompany)]
-[assembly: AssemblyProduct(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyProduct)]
-[assembly: AssemblyCopyright(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCopyright)]
-
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(false)]
-[assembly: Guid("2262061b-996b-4f6c-9295-ae09c475c41b")]
-[assembly: AssemblyVersion("1.4.0")]
-[assembly: AssemblyFileVersion("1.4.0")]
+[assembly: System.Reflection.AssemblyCompanyAttribute("Microsoft")]
+[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
+[assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
+[assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - AppConfigurationdata")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("2.0.0")]
+[assembly: System.Reflection.AssemblyVersionAttribute("2.0.0")]
+[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
+[assembly: System.CLSCompliantAttribute(false)]

generated/AppConfiguration/AppConfigurationData.Autorest/exports/Get-AzAppConfigurationKey.ps1

@@ -119,6 +119,15 @@ begin {
             $PSBoundParameters['OutBuffer'] = 1
         }
         $parameterSet = $PSCmdlet.ParameterSetName
+        
+        $testPlayback = $false
+        $PSBoundParameters['HttpPipelinePrepend'] | Foreach-Object { if ($_) { $testPlayback = $testPlayback -or ('Microsoft.Azure.PowerShell.Cmdlets.AppConfigurationdata.Runtime.PipelineMock' -eq $_.Target.GetType().FullName -and 'Playback' -eq $_.Target.Mode) } }
+
+        $context = Get-AzContext
+        if (-not $context -and -not $testPlayback) {
+            Write-Error "No Azure login detected. Please run 'Connect-AzAccount' to log in."
+            exit
+        }
 
         if ($null -eq [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion) {
             [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $PSVersionTable.PSVersion.ToString()
@@ -147,6 +156,9 @@ begin {
             [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PromptedPreviewMessageCmdlets.Enqueue($MyInvocation.MyCommand.Name)
         }
         $wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet)
+        if ($wrappedCmd -eq $null) {
+            $wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Function)
+        }
         $scriptCmd = {& $wrappedCmd @PSBoundParameters}
         $steppablePipeline = $scriptCmd.GetSteppablePipeline($MyInvocation.CommandOrigin)
         $steppablePipeline.Begin($PSCmdlet)

generated/AppConfiguration/AppConfigurationData.Autorest/exports/Get-AzAppConfigurationKeyValue.ps1

@@ -148,6 +148,15 @@ begin {
             $PSBoundParameters['OutBuffer'] = 1
         }
         $parameterSet = $PSCmdlet.ParameterSetName
+        
+        $testPlayback = $false
+        $PSBoundParameters['HttpPipelinePrepend'] | Foreach-Object { if ($_) { $testPlayback = $testPlayback -or ('Microsoft.Azure.PowerShell.Cmdlets.AppConfigurationdata.Runtime.PipelineMock' -eq $_.Target.GetType().FullName -and 'Playback' -eq $_.Target.Mode) } }
+
+        $context = Get-AzContext
+        if (-not $context -and -not $testPlayback) {
+            Write-Error "No Azure login detected. Please run 'Connect-AzAccount' to log in."
+            exit
+        }
 
         if ($null -eq [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion) {
             [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PowerShellVersion = $PSVersionTable.PSVersion.ToString()
@@ -177,6 +186,9 @@ begin {
             [Microsoft.WindowsAzure.Commands.Utilities.Common.AzurePSCmdlet]::PromptedPreviewMessageCmdlets.Enqueue($MyInvocation.MyCommand.Name)
         }
         $wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Cmdlet)
+        if ($wrappedCmd -eq $null) {
+            $wrappedCmd = $ExecutionContext.InvokeCommand.GetCommand(($mapping[$parameterSet]), [System.Management.Automation.CommandTypes]::Function)
+        }
         $scriptCmd = {& $wrappedCmd @PSBoundParameters}
         $steppablePipeline = $scriptCmd.GetSteppablePipeline($MyInvocation.CommandOrigin)
         $steppablePipeline.Begin($PSCmdlet)