Merge pull request #25099 from yifanz7/mergepreview

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

Author: NoriZC

.azure-pipelines/live-test.yml

@@ -240,3 +240,13 @@ stages:
         targetType: filePath
         filePath: ./tools/TestFx/Live/SendLiveTestReport.ps1
         arguments: -EmailServiceConnectionString '$(EmailServiceConnectionString)' -EmailFrom '$(EmailFrom)'
+
+    - task: AzurePowerShell@5
+      displayName: Save live test results
+      condition: or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.SourceBranch'], 'refs/heads/internal/release'))
+      inputs:
+        pwsh: true
+        azurePowerShellVersion: latestVersion
+        azureSubscription: $(KustoServiceConnectionName)
+        scriptType: filePath
+        scriptPath: ./tools/TestFx/Live/SaveLiveTestResult.ps1

.azure-pipelines/security-tools.yml

@@ -53,28 +53,21 @@ jobs:
       outputFormat: sarif
       scanFolder: SecurityTmp
       suppressionsFile: tools/SecurityTools/CredScanSuppressions.json
-
-  - task: PowerShell@2
-    displayName: Copy PDB for BinSkim
-    inputs:
-      targetType: inline
-      script: ./src/lib/pdb/CopyPdbToArtifacts.ps1
-      pwsh: true
 
   - task: PowerShell@2
     displayName: Generate a response text file for BinSkim
     inputs:
       targetType: 'inline'
       script: |
-        New-Item $(Build.SourcesDirectory)/artifacts/MyFileList.rsp -ItemType File -Force
-        (Get-ChildItem -Path .\artifacts\Debug -Include *.dll,*.exe -Exclude msalruntime.dll,msalruntime_arm64.dll,msalruntime_x86.dll -Recurse).FullName > $(Build.SourcesDirectory)/artifacts/MyFileList.rsp
+        New-Item $(Build.SourcesDirectory)/artifacts/FilesToScan.rsp -ItemType File -Force
+        (Get-ChildItem -Path .\artifacts\Debug -Include *.dll,*.exe -Exclude msalruntime.dll,msalruntime_arm64.dll,msalruntime_x86.dll -Recurse).FullName > $(Build.SourcesDirectory)/artifacts/FilesToScan.rsp
       pwsh: true
-
+  
   - task: securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@3
     displayName: Run BinSkim
     inputs:
       InputType: 'CommandLine'
-      arguments: 'analyze @$(Build.SourcesDirectory)/artifacts/MyFileList.rsp --recurse'
+      arguments: 'analyze @$(Build.SourcesDirectory)/artifacts/FilesToScan.rsp --config default --recurse --statistics'
 
   - task: PowerShell@2
     displayName: Cleanup Build
@@ -95,4 +88,3 @@ jobs:
     inputs:
       artifactName: artifacts
       targetPath: artifacts
-...

.azure-pipelines/sync-aliases.yml

@@ -6,34 +6,38 @@ schedules:
     include:
     - main
 
+# The 'resources' and 'uses' below are used to resolve the error 'Repository associated with wiki ID <WikiId> does not exist or you do not have permissions for the operation you are attempting.'
+resources:
+  repositories:
+  - repository: ServiceContactList
+    type: git
+    name: internal.wiki
+
 jobs:
 - job: UpdateYaml
   displayName: Update resourceManagement.yml
   pool: pool-windows-2019
+  uses:
+    repositories:
+    - ServiceContactList
 
   steps:
   - task: UseDotNet@2
     displayName: Install .NET 8 SDK
     inputs:
       packageType: sdk
       version: 8.0.x
-  - template: util/get-github-pat-steps.yml
 
   - pwsh: |
       dotnet --version
       dotnet new tool-manifest --force
       dotnet tool install powershell --version 7.4.*
     displayName: Install PowerShell 7.4.x
 
-  - template: util/get-keyvault-secret-steps.yml
-    parameters:
-      serviceConnectionName: $(AzureSubscription)
-      keyVaultName: $(KeyVaultName)
-      secretName: $(ADOTokenName)
-      outVar: 'ADOToken'
-
   - pwsh: |
-      dotnet tool run pwsh -NoLogo -NoProfile -NonInteractive -File "./tools/Github/ParseServiceContactsList.ps1 -ADOToken $(ADOToken)"
+      dotnet tool run pwsh -NoLogo -NoProfile -NonInteractive -File "./tools/Github/ParseServiceContactsList.ps1 -AccessToken $env:SYSTEM_ACCESSTOKEN"
+    env:
+      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     displayName: Update resourceManagement.yml file locally
 
   - pwsh: |
@@ -47,6 +51,8 @@ jobs:
       }
     displayName: Check if Wiki table has any changes
 
+  - template: util/get-github-pat-steps.yml
+
   - pwsh: |
       git config --global user.email "[email protected]"
       git config --global user.name "azure-powershell-bot"

.azure-pipelines/sync-tools-folder.yml

@@ -11,7 +11,6 @@ trigger:
   paths:
     include:
       - .azure-pipelines
-      - .github
       - tools
       - src/lib
       - .ci-config.json
@@ -53,4 +52,4 @@ jobs:
       $BaseBranch = "$(BranchName)"
       $Description = "Migrate Sync tools code from main branch to $(BranchName) branch"
       ./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(GithubToken) -Description $Description
-    displayName: Create PR to $(BranchName) branch
+    displayName: Create PR to $(BranchName) branch

.azure-pipelines/test-coverage.yml

@@ -1,12 +1,8 @@
 parameters:
-- name: dotnet_sdk_6
-  displayName: .NET 6
+- name: dotnet_sdk
+  displayName: .NET SDK
   type: string
   default: 6.0.x
-- name: dotnet_sdk_7
-  displayName: .NET 7
-  type: string
-  default: 7.0.x
 - name: testFramework
   displayName: Test Framework
   type: string
@@ -34,10 +30,10 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Install .NET 6 SDK'
+    displayName: 'Install .NET SDK'
     inputs:
       packageType: sdk
-      version: ${{ parameters.dotnet_sdk_6 }}
+      version: ${{ parameters.dotnet_sdk }}
 
   - task: DotNetCoreCLI@2
     displayName: Build Azure PowerShell Modules
@@ -61,10 +57,10 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: 'Install .NET 6.0 SDK'
+    displayName: 'Install .NET SDK'
     inputs:
       packageType: sdk
-      version: ${{ parameters.dotnet_sdk_6 }}
+      version: ${{ parameters.dotnet_sdk }}
 
   - task: PowerShell@2
     displayName: Initialize Environment
@@ -88,7 +84,7 @@ jobs:
       arguments: 'build.proj -t:"Test" -p:"Configuration=Debug;TestFramework=${{ parameters.testFramework }}"'
 
   - task: PowerShell@2
-    displayName: Test AutoRest-Based Cmdlets
+    displayName: Test Autorest-Based Cmdlets
     condition: succeeded()
     inputs:
       pwsh: true
@@ -101,7 +97,7 @@ jobs:
         $debugDir = Join-Path -Path $rootDir -ChildPath "artifacts" | Join-Path -ChildPath "Debug"
         $env:PSModulePath += $delimiter + $debugDir
         Get-ChildItem -Path $debugDir -Filter test-module.ps1 -File -Recurse | Select-Object -ExpandProperty FullName | ForEach-Object {
-          Write-Host "##[section]Testing $_"
+          Write-Host "##[section]Executing $_"
           & $_
         }
 
@@ -114,22 +110,6 @@ jobs:
       filePath: ./tools/TestFx/Coverage/AnalyzeTestCoverage.ps1
       arguments: -CalcBaseline
 
-  - template: util/get-keyvault-secret-steps.yml
-    parameters:
-      serviceConnectionName: $(AzureSubscription)
-      keyVaultName: $(KustoServicePrincipalKeyVaultName)
-      secretName: $(KustoServicePrincipalSecretName)
-      outVar: 'KustoServicePrincipalSecret'
-
-  - task: PowerShell@2
-    displayName: Save Test Coverage Results
-    condition: succeeded()
-    inputs:
-      pwsh: true
-      targetType: filePath
-      filePath: ./tools/TestFx/Coverage/SaveTestCoverageResult.ps1
-      arguments: CITest $(KustoTenantId) $(KustoServicePrincipalId) $(KustoServicePrincipalSecret) $(KustoClusterName) $(KustoClusterRegion)
-
   - template: util/get-github-pat-steps.yml
 
   - task: PowerShell@2

.azure-pipelines/util/live-test-steps.yml

@@ -134,23 +134,6 @@ jobs:
       filePath: ./tools/TestFx/Live/InvokeLiveTestCITask.ps1
       arguments: -UseWindowsPowerShell ('${{ parameters.psVersion }}' -eq '5.1') -ScriptFile './tools/TestFx/Live/InvokeLiveTestScenarios.ps1 -OSVersion ${{ parameters.vmImage }} -RunPlatform ${{ parameters.osType }} -RunPowerShell ${{ parameters.psVersion }}'
 
-  - template: get-keyvault-secret-steps.yml
-    parameters:
-      serviceConnectionName: $(KustoServiceConnectionName)
-      keyVaultName: $(KustoServicePrincipalKeyVaultName)
-      secretName: $(KustoServicePrincipalSecretName)
-      outVar: 'KustoServicePrincipalSecret'
-      execCondition: and(succeeded(), ne(variables['skipLatest'], 'true'))
-
-  - task: PowerShell@2
-    displayName: Save live test results to Kusto
-    condition: and(succeeded(), ne(variables['skipLatest'], 'true'), or(eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.SourceBranch'], 'refs/heads/internal/release')))
-    inputs:
-      pwsh: true
-      targetType: filePath
-      filePath: ./tools/TestFx/Live/SaveLiveTestResult.ps1
-      arguments: $(KustoTenantId) $(KustoServicePrincipalId) $(KustoServicePrincipalSecret) $(KustoClusterName) $(KustoClusterRegion)
-
   - task: PublishPipelineArtifact@1
     displayName: Publish live test results to pipeline artifact
     condition: and(succeeded(), ne(variables['skipLatest'], 'true'))

src/Accounts/Accounts.Test/EnvironmentCmdletTestsExtension.cs

@@ -79,6 +79,8 @@ public static PSAzureEnvironment GetAzureCloudEndpoints()
             env.SetProperty("AzureAppConfigurationEndpointSuffix", "azconfig.io");
             env.SetProperty("AzureAppConfigurationEndpointResourceId", "https://azconfig.io");
             env.SetProperty("ContainerRegistryEndpointResourceId", "https://management.azure.com");
+            env.SetProperty("AzureCommunicationEmailEndpointSuffix", "communication.azure.com");
+            env.SetProperty("AzureCommunicationEmailEndpointResourceId", "https://communication.azure.com");
             return env;
         }
 

src/Accounts/Accounts/Rest/InvokeAzRestMethodCommand.cs

@@ -255,6 +255,11 @@ private string MatchResourceId(IAzureContext context, string authority, out stri
                 targetResourceIdKey = AzureEnvironment.ExtendedEndpoint.AzureAppConfigurationEndpointResourceId;
                 return env.ExtendedProperties[AzureEnvironment.ExtendedEndpoint.AzureAppConfigurationEndpointResourceId];
             }
+            if (HasSameEndpointSuffix(authority, env.ExtendedProperties[AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointSuffix]))
+            {
+                targetResourceIdKey = AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointResourceId;
+                return env.ExtendedProperties[AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointResourceId];
+            }
             return null;
         }
 

src/Accounts/Accounts/Token/GetAzureRmAccessToken.cs

@@ -54,6 +54,7 @@ public class GetAzureRmAccessTokenCommand : AzureRMCmdlet
             SupportedResourceNames.Arm,
             SupportedResourceNames.Attestation,
             SupportedResourceNames.Batch,
+            SupportedResourceNames.CommunicationEmail,
             SupportedResourceNames.DataLake,
             SupportedResourceNames.KeyVault,
             SupportedResourceNames.ManagedHsm,

src/Accounts/Accounts/Utilities/SupportedResourceNames.cs

@@ -35,6 +35,7 @@ internal class SupportedResourceNames
         public const string Synapse = "Synapse";
         public const string ManagedHsm = "ManagedHsm";
         public const string AppConfiguration = "AppConfiguration";
+        public const string CommunicationEmail = "CommunicationEmail";
 
         internal static Dictionary<string, string> ResourceNameMap;
         internal static Dictionary<string, string> DataPlaneResourceNameMap;
@@ -56,7 +57,8 @@ static SupportedResourceNames()
                         { Storage, "https://storage.azure.com/" }, //OAuth scope/resource id for Storage, does not add it to ExtenedEndpoint to avoid confusion with StorageEndpointSuffix
                         { Synapse, AzureEnvironment.ExtendedEndpoint.AzureSynapseAnalyticsEndpointResourceId },
                         { ManagedHsm, AzureEnvironment.ExtendedEndpoint.ManagedHsmServiceEndpointResourceId },
-                        { AppConfiguration, AzureEnvironment.ExtendedEndpoint.AzureAppConfigurationEndpointResourceId }
+                        { AppConfiguration, AzureEnvironment.ExtendedEndpoint.AzureAppConfigurationEndpointResourceId },
+                        { CommunicationEmail, AzureEnvironment.ExtendedEndpoint.AzureCommunicationEmailEndpointResourceId }
                     };
 
             ResourceNameMap = new Dictionary<string, string>(DataPlaneResourceNameMap);