Merge branch 'main' into cplat-SIGCMKBug

Author: wyunchi-ms

src/Compute/Compute/ChangeLog.md

@@ -21,6 +21,7 @@
 -->
 ## Upcoming Release
 * Update New-AzGalleryImageVersion to take in the 'Encryption' property correctly from '-TagetRegion' parameter. 
+* Update Set-AzVmBootDiagnostic to default to managed storage account if not provided.
 * Update Compute .NET SDK package reference to version 49.1.0
 * Fixed a bug in `Get-AzVM` that caused incorrect power status output.
 

src/Compute/Compute/VirtualMachine/Config/SetAzureVMBootDiagnosticsCommand.cs

@@ -56,7 +56,6 @@ public class SetAzureVMBootDiagnosticsCommand : Microsoft.Azure.Commands.Resourc
         public SwitchParameter Disable { get; set; }
 
         [Parameter(
-            Mandatory = true,
             Position = 2,
             ParameterSetName = EnableParameterSet,
             ValueFromPipelineByPropertyName = true,
@@ -86,14 +85,7 @@ public override void ExecuteCmdlet()
 
             if (this.Enable.IsPresent)
             {
-                if (string.IsNullOrEmpty(this.StorageAccountName))
-                {
-                    if (diagnosticsProfile.BootDiagnostics.StorageUri == null)
-                    {
-                        ThrowNoStorageAccount();
-                    }
-                }
-                else
+                if (!string.IsNullOrEmpty(this.StorageAccountName))
                 {
                     var storageClient = AzureSession.Instance.ClientFactory.CreateArmClient<StorageManagementClient>(
                         DefaultProfile.DefaultContext, AzureEnvironment.Endpoint.ResourceManager);

src/Compute/Compute/help/Set-AzVMBootDiagnostic.md

@@ -15,7 +15,7 @@ Modifies boot diagnostics properties of a virtual machine.
 
 ### EnableBootDiagnostics
 ```
-Set-AzVMBootDiagnostic [-VM] <PSVirtualMachine> [-Enable] [-ResourceGroupName] <String>
+Set-AzVMBootDiagnostic [-VM] <PSVirtualMachine> [-Enable] [[-ResourceGroupName] <String>]
  [[-StorageAccountName] <String>] [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
@@ -34,7 +34,7 @@ The **Set-AzVMBootDiagnostic** cmdlet modifies boot diagnostics properties of a
 ```
 PS C:\> $VM = Get-AzVM -ResourceGroupName "ResourceGroup11" -Name "ContosoVM07"
 PS C:\> Set-AzVMBootDiagnostic -VM $VM -Enable -ResourceGroupName "ResourceGroup11" -StorageAccountName "DiagnosticStorage"
-PS C:\> Update-AzVM -VM $VM
+PS C:\> Update-AzVM -VM $VM -ResourceGroupName "ResourceGroup11"
 ```
 
 The first command gets the virtual machine named ContosoVM07 by using **Get-AzVM**.
@@ -97,15 +97,15 @@ Type: System.String
 Parameter Sets: EnableBootDiagnostics
 Aliases:
 
-Required: True
+Required: False
 Position: 2
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
 ### -StorageAccountName
-Specifies the name of the storage account in which to save boot diagnostics data.
+Specifies the name of the storage account in which to save boot diagnostics data. If not provided, it will look for a StorageUri in the BootDiagnostic Profile in the PSVirtualMachine object provided in the '-VM' parameter. If StorageUri is null, it will default to used a managed storage account. 
 
 ```yaml
 Type: System.String

src/Sql/Sql.Test/ScenarioTests/ServerCrudTests.cs

@@ -68,6 +68,20 @@ public void TestServerUpdateWithIdentity()
             RunPowerShellTest("Test-UpdateServerWithIdentity");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestServerCreateWithFederatedClientId()
+        {
+            RunPowerShellTest("Test-CreateServerWithFederatedClientId");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestServerUpdateWithFederatedClientId()
+        {
+            RunPowerShellTest("Test-UpdatingServerWithFederatedClientId");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestServerUpdateWithoutIdentity()

src/Sql/Sql.Test/ScenarioTests/ServerCrudTests.ps1

@@ -255,6 +255,69 @@ function Test-UpdateServerWithoutIdentity
 	}
 }
 
+<#
+	.SYNOPSIS
+	Tests creating a server with a federated client id
+#>
+function Test-CreateServerWithFederatedClientId
+{
+	# Setup
+	$rg = Create-ResourceGroupForTest
+
+	$serverName = Get-ServerName
+	$serverLogin = "testusername"
+	$serverPassword = "t357ingP@s5w0rd!"
+	$credentials = new-object System.Management.Automation.PSCredential($serverLogin, ($serverPassword | ConvertTo-SecureString -asPlainText -Force))
+	$federatedClientId = "3728d52a-7b46-47a9-8a8c-318c27263eef";
+
+	try
+	{
+		New-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName -Location "eastus2euap" -SqlAdministratorCredentials $credentials -FederatedClientId $federatedClientId -AssignIdentity
+		$respserver = Get-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName
+		Assert-AreEqual $respserver.ServerName $serverName
+		Assert-AreEqual $respserver.FederatedClientId $federatedClientId
+	}
+	finally
+	{
+		Remove-ResourceGroupForTest $rg
+	}
+}
+
+<#
+	.SYNOPSIS
+	Tests updating a server with a federated client id
+#>
+function Test-UpdatingServerWithFederatedClientId
+{
+	# Setup
+	$rg = Create-ResourceGroupForTest
+
+	$serverName = Get-ServerName
+	$serverLogin = "testusername"
+	$serverPassword = "t357ingP@s5w0rd!"
+	$credentials = new-object System.Management.Automation.PSCredential($serverLogin, ($serverPassword | ConvertTo-SecureString -asPlainText -Force))
+	$federatedClientId = "3728d52a-7b46-47a9-8a8c-318c27263eef";
+	$updatedFederatedClientId = "dac7a46b-3dc9-4893-ab34-18169a917073";
+
+	try
+	{
+		$server1 = New-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $serverName -Location "eastus2euap" -SqlAdministratorCredentials $credentials -FederatedClientId $federatedClientId -AssignIdentity
+		Assert-AreEqual $server1.ServerName $serverName
+		Assert-AreEqual $server1.FederatedClientId $federatedClientId
+
+		# Update server with new Federated client id
+		$newPassword = "n3wc00lP@55w0rd"
+		$secureString = ConvertTo-SecureString $newPassword -AsPlainText -Force
+		$server2 = Set-AzSqlServer -ResourceGroupName $rg.ResourceGroupName -ServerName $server1.ServerName -SqlAdministratorPassword $secureString -FederatedClientId $updatedFederatedClientId
+		Assert-AreEqual $server2.FederatedClientId $updatedFederatedClientId
+	}
+	finally
+	{
+		Remove-ResourceGroupForTest $rg
+	}
+}
+
+
 <#
 	.SYNOPSIS
 	Tests create and update a server with minimal TLS version