Merge pull request #20970 from wastoresh/mergestorge1

[Do not Squash] Merge main branch to Az.Storage-preview branch (#1)

Author: BethanyZhou

.azure-pipelines/sync-aliases.yml

@@ -0,0 +1,39 @@
+# Variable 'ADOToken' and 'BotAccessToken' was defined in the Variables tab
+schedules:
+- cron: "50 15 * * *"
+  displayName: 11:50 PM (UTC + 8:00) China Daily Run
+  branches:
+    include:
+    - main
+
+jobs:
+- job: UpdateJson
+  displayName: Update fabricbot.json
+  steps:
+  - pwsh: |
+      ./tools/Github/ParseWiki2Json.ps1 -ADOToken $(ADOToken)
+    displayName: Update fabricbot.json file locally
+      
+  - task: PowerShell@2
+    displayName: Git commit and push
+    inputs:
+      targetType: inline
+      script: |
+        git config --global user.email "[email protected]"
+        git config --global user.name "azure-powershell-bot"
+        git checkout -b "internal/sync-fabricbot-json"
+        
+        git add .
+        git commit -m "Sync fabricbot.json"
+        
+        git remote set-url origin https://$(BotAccessToken)@github.com/Azure/azure-powershell.git;
+        git push origin internal/sync-fabricbot-json --force
+  
+  - pwsh: |
+      $Title = "Sync fabricbot.json According To ADO Wiki Page"
+      $HeadBranch = "internal/sync-fabricbot-json"
+      $BaseBranch = "main"
+      $Description = "This PR sync taskType: scheduledAndTrigger part of fabricbot.json from table of Service-Team-Label-and-Contact-List in ADO wiki page"
+      ./tools/Github/CreatePR.ps1 -Title $Title -HeadBranch $HeadBranch -BaseBranch $BaseBranch -BotAccessToken $(BotAccessToken) -Description $Description
+    displayName: Create PR to main branch
+  

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

@@ -78,13 +78,6 @@ jobs:
        Write-Host "List artifacts..."
        Get-ChildItem "$(Pipeline.Workspace)\\LocalRepo\\"
 
-  - task: NuGetCommand@2
-    condition: and(succeeded(), eq('${{ parameters.psVersion }}', '5.1.14'))
-    displayName: 'Download ThreadJob .nupkg File for PowerShell 5.1.14'
-    inputs:
-      command: custom
-      arguments: 'install ThreadJob -directdownload -packagesavemode nupkg -source https://www.powershellgallery.com/api/v2 -OutputDirectory packages'
-
   - task: NuGetCommand@2
     condition: and(succeeded(), eq(variables['GalleryName'], 'LocalRepo'))
     displayName: 'Download Previous Az .nupkg Files'

src/Accounts/Accounts/ChangeLog.md

@@ -19,6 +19,8 @@
 -->
 
 ## Upcoming Release
+* Updated Azure.Core library to 1.28.0.
+* Fixed an issue that the helper message about missing modules shows up at the wrong time. [#19228]
 
 ## Version 2.11.2
 * Supported Web Account Manager on ARM64-based Windows systems. Fixed an issue where `Connect-AzAccount` failed with error "Unable to load DLL 'msalruntime_arm64'". [#20700]

src/Accounts/Accounts/Utilities/CommandNotFoundHelper.cs

@@ -131,7 +131,9 @@ public static void RegisterCommandNotFoundAction(CommandInvocationIntrinsics cii
 
         private static void OnCommandNotFound(object sender, CommandLookupEventArgs args)
         {
-            if (IsAzOrAzureRMCmdlet(args.CommandName))
+            // The command was dispatched by the msh engine as a result of a dispatch request from an already running command.
+            // We are not interested in such cases.
+            if (args.CommandOrigin == CommandOrigin.Runspace && IsAzOrAzureRMCmdlet(args.CommandName))
             {
                 bool isHelpful = true;
                 if (IsAzureRMCommand(args.CommandName))

src/Accounts/AssemblyLoading/ConditionalAssemblyProvider.cs

@@ -42,7 +42,7 @@ public static void Initialize(string rootPath, IConditionalAssemblyContext conte
                 // todo: add a tool to update assembly versions after replacing the assemblies. (Can it support newly introduced assemblies?)
                 // todo: consider moving the list to a standalone config file
                 #region AssemblyList
-                CreateAssembly("netcoreapp2.1", "Azure.Core", "1.25.0.0").WithPowerShellCore(),
+                CreateAssembly("netcoreapp2.1", "Azure.Core", "1.28.0.0").WithPowerShellCore(),
                 CreateAssembly("netcoreapp2.1", "Microsoft.Identity.Client", "4.49.1.0").WithPowerShellCore(),
                 CreateAssembly("netcoreapp3.1", "Microsoft.Identity.Client.Extensions.Msal", "2.23.0.0").WithPowerShellCore(),
 
@@ -64,7 +64,7 @@ public static void Initialize(string rootPath, IConditionalAssemblyContext conte
                 CreateAssembly("netstandard2.0", "System.ServiceModel.Primitives", "4.7.0.0").WithWindowsPowerShell(),
                 CreateAssembly("netstandard2.0", "System.Threading.Tasks.Extensions", "4.2.0.1").WithWindowsPowerShell(),
 
-                CreateAssembly("netfx", "Azure.Core", "1.25.0.0").WithWindowsPowerShell(),
+                CreateAssembly("netfx", "Azure.Core", "1.28.0.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "Microsoft.Identity.Client", "4.49.1.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "Microsoft.Identity.Client.Extensions.Msal", "2.23.0.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "Newtonsoft.Json", "12.0.0.0").WithWindowsPowerShell(),

src/Automation/Automation.Sdk/Properties/AssemblyInfo.cs

@@ -26,5 +26,5 @@
 [assembly: CLSCompliant(false)]
 [assembly: Guid("ca7999e0-ca2f-47fc-9c30-f982d9e3a6ed")]
 
-[assembly: AssemblyVersion("1.9.0")]
-[assembly: AssemblyFileVersion("1.9.0")]
+[assembly: AssemblyVersion("1.9.1")]
+[assembly: AssemblyFileVersion("1.9.1")]

src/Automation/Automation/Az.Automation.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 1/6/2023
+# Generated on: 2/7/2023
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '1.9.0'
+ModuleVersion = '1.9.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.11.0'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.11.2'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'Microsoft.Azure.PowerShell.Automation.Sdk.dll'
@@ -179,7 +179,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Updated Example: Start-AzAutomationRunbook should pass ordered dictionary for parameters [#20408]'
+        ReleaseNotes = '* Fixed bug: Runbooks Name Pattern failures. '
 
         # Prerelease string of this module
         # Prerelease = ''

src/Automation/Automation/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+
+## Version 1.9.1
 * Fixed bug: Runbooks Name Pattern failures. 
 
 ## Version 1.9.0

src/Automation/Automation/Properties/AssemblyInfo.cs

@@ -43,8 +43,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.9.0")]
-[assembly: AssemblyFileVersion("1.9.0")]
+[assembly: AssemblyVersion("1.9.1")]
+[assembly: AssemblyFileVersion("1.9.1")]
 #if !SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Automation.Test")]
 #endif

src/PolicyInsights/PolicyInsights.Test/EnvSetup/AttestationMetadata.json

@@ -0,0 +1 @@
+{"TestKey": "TestValue"}

src/PolicyInsights/PolicyInsights.Test/EnvSetup/EnvironmentSetup.ps1

@@ -91,3 +91,74 @@ Start-TestSleep -Seconds 60
 foreach ($resourceGroupName in @($resourceGroup1, $resourceGroup2)) {
    New-AzResourceGroupDeployment -ResourceGroupName $resourceGroupName -TemplateFile "$PSScriptRoot/CreateNSGsTemplate.json" -resourceCount 510 -resourceNamePrefix $(Get-TestResourceNamePrefix)
 }
+
+#region Attestation Tests Setup
+$resourceGroup3 = $(Get-PSAttestationTestRGName)
+
+# Create the required RG(s) for attestations.
+foreach ($resourceGroupName in @($resourceGroup3)) {
+   Get-AzResourceGroup -Name $resourceGroupName -ErrorVariable rgNotPresent -ErrorAction SilentlyContinue
+   if ($rgNotPresent) {
+      New-AzResourceGroup -Name $resourceGroupName -Location "northcentralus"
+   }
+}
+
+# Create Subscription targetting manual policy
+$manualPolicySubcriptionDefinition = New-AzPolicyDefinition -Name $(Get-TestManualPolicyDefinitonNameSub) -Policy "$PSScriptRoot/ManualPolicySubDefinition.json" -DisplayName "PS cmdlet tests: Subscription Manual Policy" -Mode All
+
+# Create RG targetting manual policy
+$manualPolicyRGDefinition = New-AzPolicyDefinition -Name $(Get-TestManualPolicyDefinitonNameRG) -Policy "$PSScriptRoot/ManualPolicyRGDefinition.json" -DisplayName "PS cmdlet tests: RG Manual Policy" -Mode All
+
+# Create Resource targetting manual policy
+$manualPolicyResourceDefinition = New-AzPolicyDefinition -Name $(Get-TestManualPolicyDefinitonNameResource) -Policy "$PSScriptRoot/ManualPolicyResourceDefinition.json" -DisplayName "PS cmdlet tests: Resource Manual Policy" -Mode All
+
+# Create a network security group for testing resource level attestations.
+New-AzResourceGroupDeployment -ResourceGroupName $resourceGroup3 -TemplateFile "$PSScriptRoot/CreateNSGsTemplate.json" -resourceCount 1 -resourceNamePrefix $(Get-TestResourceNamePrefix)
+
+# Assign the manual policies targetting each of Subscription, Resource Groups and Resource Types to the subscription
+$manualPolicySubAssignment = New-AzPolicyAssignment -Name $(Get-TestAttestationSubscriptionPolicyAssignmentName) -Scope "/subscriptions/$subscriptionId" -DisplayName "PS cmdlet tests: Subscription Manual Policy" -PolicyDefinition $manualPolicySubcriptionDefinition
+
+$manualPolicyRGAssignment = New-AzPolicyAssignment -Name $(Get-TestAttestationRGPolicyAssignmentName) -Scope "/subscriptions/$subscriptionId" -DisplayName "PS cmdlet tests: RG Manual Policy" -PolicyDefinition $manualPolicyRGDefinition
+
+$manualPolicyResourceAssignment = New-AzPolicyAssignment -Name $(Get-TestAttestationResourcePolicyAssignmentName) -Scope "/subscriptions/$subscriptionId" -DisplayName "PS cmdlet tests: Resource Manual Policy" -PolicyDefinition $manualPolicyResourceDefinition
+
+# Define Policy Initiatives
+$manualpolicyDefinitionsSubscription = @"
+[
+   {
+      "policyDefinitionId":"$($manualPolicySubcriptionDefinition.ResourceId)",
+      "policyDefinitionReferenceId": "$(Get-TestManualPolicyDefinitonNameSub)_1"
+   }
+]
+"@
+
+$manualpolicyDefinitionsRG = @"
+[
+   {
+      "policyDefinitionId":"$($manualPolicyRGDefinition.ResourceId)",
+      "policyDefinitionReferenceId": "$(Get-TestManualPolicyDefinitonNameRG)_1"
+   }
+]
+"@
+
+$manualpolicyDefinitionsResource = @"
+[
+   {
+        "policyDefinitionId":"$($manualPolicyResourceDefinition.ResourceId)",
+      "policyDefinitionReferenceId": "$(Get-TestManualPolicyDefinitonNameResource)_1"
+   }
+]
+"@
+
+$policySetDefinitionSub = New-AzPolicySetDefinition -Name $(Get-TestManualPolicyInitiativeNameSub) -DisplayName "PS cmdlet tests: Attestation initiative SUB" -PolicyDefinition $manualpolicyDefinitionsSubscription -SubscriptionId $subscriptionId
+$policySetDefinitionRG = New-AzPolicySetDefinition -Name $(Get-TestManualPolicyInitiativeNameRG) -DisplayName "PS cmdlet tests: Attestation initiative RG" -PolicyDefinition $manualpolicyDefinitionsRG -SubscriptionId $subscriptionId
+$policySetDefinitionResource = New-AzPolicySetDefinition -Name $(Get-TestManualPolicyInitiativeNameResource) -DisplayName "PS cmdlet tests: Attestation initiative Resource" -PolicyDefinition $manualpolicyDefinitionsResource -SubscriptionId $subscriptionId
+
+# Assign the initiatives to the subscription
+New-AzPolicyAssignment -Name $(Get-TestInitiativeAttestationSubPolicyAssignmentName) -Scope "/subscriptions/$subscriptionId" -DisplayName "PS cmdlet tests: Attestation initiative SUB" -PolicySetDefinition $policySetDefinitionSub
+
+New-AzPolicyAssignment -Name $(Get-TestInitiativeAttestationRGPolicyAssignmentName) -Scope "/subscriptions/$subscriptionId" -DisplayName "PS cmdlet tests: Attestation initiative RG" -PolicySetDefinition $policySetDefinitionRG
+
+New-AzPolicyAssignment -Name $(Get-TestAttestationInitiativeResourcePolicyAssignmentName) -Scope "/subscriptions/$subscriptionId" -DisplayName "PS cmdlet tests: Attestation initiative Resource" -PolicySetDefinition $policySetDefinitionResource
+
+#endregion

src/PolicyInsights/PolicyInsights.Test/EnvSetup/ManualPolicyRGDefinition.json

@@ -0,0 +1,9 @@
+{
+    "if": {
+        "field": "type",
+        "equals": "microsoft.resources/subscriptions/resourcegroups"
+    },
+    "then": {
+        "effect": "manual"
+    }
+}

src/PolicyInsights/PolicyInsights.Test/EnvSetup/ManualPolicyResourceDefinition.json

@@ -0,0 +1,9 @@
+{
+    "if": {
+        "field": "type",
+        "equals": "Microsoft.Network/networkSecurityGroups"
+    },
+    "then": {
+        "effect": "manual"
+    }
+}

src/PolicyInsights/PolicyInsights.Test/EnvSetup/ManualPolicySubDefinition.json

@@ -0,0 +1,9 @@
+{
+    "if": {
+        "field": "type",
+        "equals": "microsoft.resources/subscriptions"
+    },
+    "then": {
+        "effect": "manual"
+    }
+}

src/PolicyInsights/PolicyInsights.Test/PolicyInsights.Test.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.PolicyInsights" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.PolicyInsights" Version="5.1.0" />
   </ItemGroup>
 
 </Project>

src/PolicyInsights/PolicyInsights.Test/ScenarioTests/AttestationTests.cs

@@ -0,0 +1,68 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// 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,
+// 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.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Azure.Commands.PolicyInsights.Test.ScenarioTests
+{
+    public class AttestationTests : PolicyInsightsTestRunner
+    
+    {
+        public AttestationTests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
+        {
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void SubscriptionScopeCrud()
+        {
+            TestRunner.RunTestScript("Attestation-SubscriptionScope-Crud");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void ResourceGroupScopeCrud()
+        {
+            TestRunner.RunTestScript("Attestation-ResourceGroupScope-Crud");
+        }
+        
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void ResourceScopeCrud()
+        {
+            TestRunner.RunTestScript("Attestation-ResourceScope-Crud");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void AttestationGetCollection()
+        {
+            TestRunner.RunTestScript("Attestation-GetCollection");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void AttestationErrorHandling()
+        {
+            TestRunner.RunTestScript("Attestation-Error-Handling");
+        }
+        
+    }
+}