Added Delete Option for Set-AzVmssStorageProfile and Add-AzVmssDataD… (Azure#19102)

* Added  Delete Option for Set-AzVmssStorageProfile and Add-AzVmssDataDisk cmdlets

* Updated Add-AzVmss and Set-AzVmsss .md files

Modified Change log and Add-AzVmssDataDisk and Set-AzVmssStorageProfile md files.

* Resolve Change Log Conflict

Updated change log

* Added Help Message and Argument Completer.

Added Help Message and Argument Completer and also updated md files to remove unwanted spaces and addressed nit remarks

* Updated Change log

Updated Change log.md

* Renamed OsDiskDeletion parameter to OsDiskDeleteOption

Co-authored-by: Yeming Liu <11371776+isra-fel@users.noreply.github.com>

Author: pselugar

src/Compute/Compute/ChangeLog.md

@@ -20,7 +20,10 @@
 
 -->
 ## Upcoming Release
+* Added Disk Delete Optional parameters `OsDisk Deletion Option` and `Delete Option` to the `Set-AzVmssStorageProfile` (OS Disk) and `Add-AzVmssDataDisk` (Data Disk)
+
 * Improve printed output for `Get-AzComputeResourceSku`
+
 * Updated `Update-AzVm` to give constructive error messages when empty variables are passed in parameters. [#15081]
 
 ## Version 4.30.0

src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/AddAzureRmVmssDataDiskCommand.cs

@@ -69,6 +69,13 @@ public partial class AddAzureRmVmssDataDiskCommand : Microsoft.Azure.Commands.Re
             ValueFromPipelineByPropertyName = true)]
         public string CreateOption { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Specifies whether Data disk should be deleted or detached upon VMSS Flex deletion(This feature is available for VMSS with Flexible OrchestrationMode only)")]
+        [PSArgumentCompleter("Delete", "Detach")]
+        public string DeleteOption { get; set; }
+
         [Parameter(
             Mandatory = false,
             ValueFromPipelineByPropertyName = true)]
@@ -133,6 +140,27 @@ private void Run()
             vDataDisks.DiskSizeGB = this.IsParameterBound(c => c.DiskSizeGB) ? this.DiskSizeGB : (int?)null;
             vDataDisks.DiskIOPSReadWrite = this.IsParameterBound(c => c.DiskIOPSReadWrite) ? this.DiskIOPSReadWrite : (long?)null;
             vDataDisks.DiskMBpsReadWrite = this.IsParameterBound(c => c.DiskMBpsReadWrite) ? this.DiskMBpsReadWrite : (long?)null;
+
+            if (this.IsParameterBound(c => c.DeleteOption))
+            {
+                
+                // VirtualMachineProfile
+                if (this.VirtualMachineScaleSet.VirtualMachineProfile == null)
+                {
+                    this.VirtualMachineScaleSet.VirtualMachineProfile = new PSVirtualMachineScaleSetVMProfile();
+                }
+                // StorageProfile
+                if (this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile == null)
+                {
+                    this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile = new VirtualMachineScaleSetStorageProfile();
+                }
+                // DataDisks
+                if (this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile.DataDisks == null)
+                {
+                    this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile.DataDisks = new List<VirtualMachineScaleSetDataDisk>();
+                }
+                vDataDisks.DeleteOption = this.DeleteOption;
+            }
             if (this.IsParameterBound(c => c.StorageAccountType))
             {
                 // ManagedDisk

src/Compute/Compute/Generated/VirtualMachineScaleSet/Config/SetAzureRmVmssStorageProfileCommand.cs

@@ -87,6 +87,13 @@ public partial class SetAzureRmVmssStorageProfileCommand : Microsoft.Azure.Comma
             ValueFromPipelineByPropertyName = true)]
         public string OsDiskCreateOption { get; set; }
 
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Specifies whether OS disk should be deleted or detached upon VMSS Flex deletion(This feature is available for VMSS with Flexible OrchestrationMode only)")]
+        [PSArgumentCompleter("Delete", "Detach")]
+        public string OsDiskDeleteOption { get; set; }
+
         [Parameter(
             Mandatory = false,
             Position = 8,
@@ -330,6 +337,27 @@ private void Run()
                 this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile.OsDisk.CreateOption = this.OsDiskCreateOption;
             }
 
+            //DiskDeletion
+            if (this.IsParameterBound(c => c.OsDiskDeleteOption))
+            {
+                // VirtualMachineProfile
+                if (this.VirtualMachineScaleSet.VirtualMachineProfile == null)
+                {
+                    this.VirtualMachineScaleSet.VirtualMachineProfile = new PSVirtualMachineScaleSetVMProfile();
+                }
+                // StorageProfile
+                if (this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile == null)
+                {
+                    this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile = new VirtualMachineScaleSetStorageProfile();
+                }
+                // OsDisk
+                if (this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile.OsDisk == null)
+                {
+                    this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile.OsDisk = new VirtualMachineScaleSetOSDisk();
+                }
+                this.VirtualMachineScaleSet.VirtualMachineProfile.StorageProfile.OsDisk.DeleteOption = this.OsDiskDeleteOption;
+            }
+
             if (this.IsParameterBound(c => c.DiffDiskPlacement) & !this.IsParameterBound(c => c.DiffDiskPlacement))
             {
                 WriteError(new ErrorRecord(

src/Compute/Compute/help/Add-AzVmssDataDisk.md

@@ -14,8 +14,8 @@ Adds a data disk to the VMSS.
 
 ```
 Add-AzVmssDataDisk [-VirtualMachineScaleSet] <PSVirtualMachineScaleSet> [[-Name] <String>] [[-Lun] <Int32>]
- [[-Caching] <CachingTypes>] [-WriteAccelerator] [-CreateOption <String>] [-DiskSizeGB <Int32>]
- [-DiskIOPSReadWrite <Int64>] [-DiskMBpsReadWrite <Int64>] [-StorageAccountType <String>]
+ [[-Caching] <CachingTypes>] [-WriteAccelerator] [-CreateOption <String>] [-DeleteOption <String>]
+ [-DiskSizeGB <Int32>] [-DiskIOPSReadWrite <Int64>] [-DiskMBpsReadWrite <Int64>] [-StorageAccountType <String>]
  [-DiskEncryptionSetId <String>] [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
@@ -81,6 +81,25 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -DeleteOption
+Specifies whether data disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only)
+
+Accepted Values 
+Delete - If this value is used, the data disk is deleted when the VMSS Flex VM is deleted.
+Detach - If this value is used, the data disk is retained after VMSS Flex VM is deleted.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -DiskEncryptionSetId
 Specifies the resource Id of customer managed disk encryption set.  This can only be specified for managed disk.
 

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

@@ -17,8 +17,8 @@ Sets the storage profile properties for the VMSS.
 Set-AzVmssStorageProfile [-VirtualMachineScaleSet] <PSVirtualMachineScaleSet>
  [[-ImageReferencePublisher] <String>] [[-ImageReferenceOffer] <String>] [[-ImageReferenceSku] <String>]
  [[-ImageReferenceVersion] <String>] [[-OsDiskName] <String>] [[-OsDiskCaching] <CachingTypes>]
- [[-OsDiskCreateOption] <String>] [[-OsDiskOsType] <OperatingSystemTypes>] [[-Image] <String>]
- [[-VhdContainer] <String[]>] [-ImageReferenceId <String>] [-OsDiskWriteAccelerator]
+ [[-OsDiskCreateOption] <String>] [-OsDiskDeleteOption <String>] [[-OsDiskOsType] <OperatingSystemTypes>]
+ [[-Image] <String>] [[-VhdContainer] <String[]>] [-ImageReferenceId <String>] [-OsDiskWriteAccelerator]
  [-DiffDiskSetting <String>] [-DiffDiskPlacement <String>] [-ManagedDisk <String>]
  [-DiskEncryptionSetId <String>] [-DataDisk <VirtualMachineScaleSetDataDisk[]>]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
@@ -266,6 +266,25 @@ Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
+### -OsDiskDeleteOption
+Specifies whether OS disk should be deleted or detached upon VMSS Flex deletion (This feature is available for VMSS with Flexible OrchestrationMode only).
+
+Accepted Values 
+Delete - If this value is used, the OS disk is deleted when the VMSS Flex VM is deleted.
+Detach - If this value is used, the OS disk is retained after VMSS Flex VM is deleted.
+
+```yaml
+Type: System.String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
 ### -OsDiskName
 Specifies the name of the operating system disk.