Merge remote-tracking branch 'origin/main' into yabo/merge-release-2025-01-14-to-main

Author: VeryEarly

documentation/development-docs/examples/private-link-resource-example.md

@@ -84,7 +84,7 @@ $VNet=Get-AzVirtualNetwork -ResourceGroupName {rgName} -Name {vnetName}
 
 + private link service connection (object in memory)
 ```
-$PLSConnection = New-AzPrivateLinkServiceConnection -Name {plsConnectionName} -PrivateLinkServiceId $TopLevelResource.Id -GroupId $TopLevelResource.GroupId
+$PLSConnection = New-AzPrivateLinkServiceConnection -Name {plsConnectionName} -PrivateLinkServiceId $TopLevelResource.Id -GroupId $PrivateLinkResource.GroupId
 ```
 
 + endpoint

src/Automation/Automation/ChangeLog.md

@@ -18,8 +18,12 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+<<<<<<< HEAD
 
 ## Version 1.11.0
+=======
+* Fixed Bug: Start-AzAutomationRunbook throws object reference error when the automation account is not available in the subscription 
+>>>>>>> origin/main
 * Upgraded nuget package to signed package.
 
 ## Version 1.10.0

src/Automation/Automation/Common/AutomationPSClient.cs

@@ -2158,7 +2158,7 @@ private IDictionary<string, string> ProcessRunbookParameters(string resourceGrou
                     i++;
                 }
             }
-            else
+            else if(runbook != null)
             {
                 runbookParameters = runbook.Parameters.Cast<DictionaryEntry>().ToDictionary(k => k.Key.ToString(), k => (RunbookParameter)k.Value);
 

src/Compute/Compute.Test/ScenarioTests/ComputeTestCommon.ps1

@@ -138,6 +138,47 @@ function Create-KeyVault
     return $properties
 }
 
+# Create key vault resources
+function Create-KeyVaultWithAclEncryptionIdentity
+{
+    Param
+    (
+        [Parameter(Mandatory=$true, Position=0)]
+        [string] $resourceGroupName,
+        [Parameter(Mandatory=$true, Position=1)]
+        [string] $location,
+        [Parameter(Mandatory=$false, Position=2)]
+        [string] $vaultName,
+        [Parameter(Mandatory=$false, Position=3)]
+        [String] $userIdentityPrincipalId
+    )
+
+    # initialize parameters if needed
+    if ([string]::IsNullOrEmpty($resourceGroupName)) { $resourceGroupName = Get-ComputeTestResourceName }
+    if ([string]::IsNullOrEmpty($location)) { $location = Get-ComputeVMLocation }
+    if ([string]::IsNullOrEmpty($vaultName)) { $vaultName = 'kv' + $resourceGroupName }
+
+    # create vault
+    $vault = New-AzKeyVault -VaultName $vaultName -ResourceGroupName $resourceGroupName -Location $location -Sku standard -DisableRbacAuthorization
+    $vault = Get-AzKeyVault -VaultName $vaultName -ResourceGroupName $resourceGroupName
+
+    # create access policy
+    $servicePrincipalName = (Get-AzContext).Account.Id
+    Assert-NotNull $servicePrincipalName
+    if (-not [string]::IsNullOrEmpty($userIdentityPrincipalId)) {
+       Set-AzKeyVaultAccessPolicy -VaultName $vaultName -ResourceGroupName $resourceGroupName -ObjectId $userIdentityPrincipalId -PermissionsToKeys all -PermissionsToSecrets all
+    }
+    Set-AzKeyVaultAccessPolicy -VaultName $vaultName -ResourceGroupName $resourceGroupName -EnabledForDeployment -EnabledForTemplateDeployment
+
+    # return the newly created key vault properties
+    $properties = New-Object PSObject -Property @{
+        DiskEncryptionKeyVaultId = $vault.ResourceId
+        DiskEncryptionKeyVaultUrl = $vault.VaultUri
+        #KeyEncryptionKeyUrl = $kek.Key.kid
+    }
+    return $properties
+}
+
 # Create a new virtual machine with other necessary resources configured
 function Create-VirtualMachine
 {

src/Compute/Compute.Test/ScenarioTests/VirtualMachineExtensionTests.cs

@@ -156,6 +156,33 @@ public void TestAzureDiskEncryptionLnxManagedDisk()
             TestRunner.RunTestScript("Test-AzureDiskEncryptionLnxManagedDisk");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestAzureDiskEncryptionWithEncryptionIdentityAddedInAzVmConfig()
+        {
+            TestRunner.RunTestScript("Test-AzureDiskEncryptionWithEncryptionIdentityAddedInAzVmConfig");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestAzureDiskEncryptionWithEncryptionIdentityAddedInSetADECmdlet()
+        {
+            TestRunner.RunTestScript("Test-AzureDiskEncryptionWithEncryptionIdentityAddedInSetADECmdlet");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestAzureDiskEncryptionWithIdentityNotSetInVirtualMachine()
+        {
+            TestRunner.RunTestScript("Test-AzureDiskEncryptionWithIdentityNotSetInVirtualMachine");
+        }
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestAzureDiskEncryptionWithIdentityNotAckledInKeyVault()
+        {
+            TestRunner.RunTestScript("Test-AzureDiskEncryptionWithIdentityNotAckledInKeyVault");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachineBginfoExtension()