New-AzGalleryImageVersion update property mapping (Azure#19779)

* update encryption property

* update md

* changelog

* Update ChangeLog.md

Co-authored-by: Theodore Chang <[email protected]>

Author: grizzlytheodore

src/Compute/Compute/ChangeLog.md

@@ -20,6 +20,7 @@
 
 -->
 ## Upcoming Release
+* For `New-AzGalleryImageVersion`, update property mapping for `Encryption`. 
 
 ## Version 4.32.0
 * Added the `TimeCreated` property to the Virtual Machine and Virtual Machine Scale Set models.

src/Compute/Compute/Generated/GalleryImageVersion/GalleryImageVersionCreateOrUpdateMethod.cs

@@ -128,8 +128,21 @@ public override void ExecuteCmdlet()
                             };
                             if (t["Encryption"] != null)
                             {
-                                var osDiskEncryptionSetId = (string)((Hashtable)((Hashtable)t["Encryption"])["osDiskImage"])["DiskEncryptionSetId"];
-                                var osDiskImageEncryption = new OSDiskImageEncryption(osDiskEncryptionSetId);
+                                OSDiskImageEncryption osDiskImageEncryption = new OSDiskImageEncryption();
+                                if (((Hashtable)((Hashtable)t["Encryption"])["osDiskImage"]) != null)
+                                {
+                                    var osDiskEncryptionSetId = (string)((Hashtable)((Hashtable)t["Encryption"])["osDiskImage"])["DiskEncryptionSetId"];
+                                    osDiskImageEncryption.DiskEncryptionSetId = osDiskEncryptionSetId;
+
+                                    var cVMEncryptionType = (string)((Hashtable)((Hashtable)t["Encryption"])["osDiskImage"])["CVMEncryptionType"];
+                                    var cVMDiskEncryptionSetID = (string)((Hashtable)((Hashtable)t["Encryption"])["osDiskImage"])["CVMDiskEncryptionSetID"];
+                                    if (cVMEncryptionType != null || cVMDiskEncryptionSetID != null)
+                                    {
+                                        OSDiskImageSecurityProfile osDiskImageSecurityProfile = new OSDiskImageSecurityProfile(cVMEncryptionType, cVMDiskEncryptionSetID);
+                                        osDiskImageEncryption.SecurityProfile = osDiskImageSecurityProfile;
+                                    }
+
+                                }
 
                                 List<DataDiskImageEncryption> dataDiskImageEncryption = null;
                                 var dataDiskImage = (object[])((Hashtable)t["Encryption"])["dataDiskImages"];
@@ -147,34 +160,6 @@ public override void ExecuteCmdlet()
                                 target.Encryption = new EncryptionImages(osDiskImageEncryption, dataDiskImageEncryption);
                             }
 
-                            if (t["CVMEncryptionType"] != null)
-                            {  
-                                if (target.Encryption == null)
-                                {
-                                    target.Encryption = new EncryptionImages();
-                                }
-                                target.Encryption.OsDiskImage = new OSDiskImageEncryption();
-                                target.Encryption.OsDiskImage.SecurityProfile = new OSDiskImageSecurityProfile();
-                                target.Encryption.OsDiskImage.SecurityProfile.ConfidentialVMEncryptionType = (string)t["CVMEncryptionType"];
-                            }
-
-                            if (t["CVMDiskEncryptionSetID"] != null)
-                            {
-                                if (target.Encryption == null)
-                                {
-                                    target.Encryption = new EncryptionImages();
-                                }
-                                if (target.Encryption.OsDiskImage == null)
-                                {
-                                    target.Encryption.OsDiskImage = new OSDiskImageEncryption();
-                                }
-                                if (target.Encryption.OsDiskImage.SecurityProfile == null)
-                                {
-                                    target.Encryption.OsDiskImage.SecurityProfile = new OSDiskImageSecurityProfile();
-                                }
-                                target.Encryption.OsDiskImage.SecurityProfile.SecureVMDiskEncryptionSetId = (string)t["CVMDiskEncryptionSetID"];
-                            }
-
                             galleryImageVersion.PublishingProfile.TargetRegions.Add(target);
                         }
                     }

src/Compute/Compute/help/New-AzGalleryImageVersion.md

@@ -154,16 +154,21 @@ $galleryName = "myGallery"
 $galleryImageDefinitionName = "myImage"
 $galleryImageVersionName = "1.0.0"
 $location = "eastus"
+
 $sourceImageId = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myVMRG/providers/Microsoft.Compute/virtualMachines/myVM"
 $diskEncryptionSetId = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myVMRG/providers/Microsoft.Compute/diskEncryptionSets/cvmDiskEncryptionSet"
-$replicaCount = 1
-$storageAccountType = "Standard_ZRS"
-$region_eastus = @{Name = 'East US';ReplicaCount = 3;StorageAccountType = 'Standard_LRS'; CVMEncryptionType="EncryptedWithCmk"; CVMDiskEncryptionSetID=$diskEncryptionSetId}
-$region_westus = @{Name = 'West US'}
+
+$cvmOsDiskEncryption = @{CVMEncryptionType=EncryptedWithCmk; CVMDiskEncryptionSetID=$diskEncryptionSetId}
+
+$cvmDataDiskEncryption_lun0 = @{DiskEncryptionSetId = $diskEncryptionSetId ; Lun = 0}
+$cvmDataDiskEncryption = @($cvmDataDiskEncryption_lun0)
+
+$cvmEncryption = @{OSDiskImage = $cvmOsDiskEncryption; DataDiskImages = $cvmDataDiskEncryption}
+$region_eastus = @{Name = 'East US';ReplicaCount = 3;StorageAccountType = 'Standard_LRS'; Encryption = $cvmEncryption}
 $region_ukwest = @{Name = 'UK West';ReplicaCount = 2}
-$region_southcentralus = @{Name = 'South Central US';StorageAccountType = 'Standard_LRS'}
-$targetRegions = @($region_eastus, $region_westus, $region_ukwest, $region_southcentralus)
-New-AzGalleryImageVersion -ResourceGroupName $rgName -GalleryName $galleryName -GalleryImageDefinitionName $galleryImageDefinitionName -Name $galleryImageVersionName -Location $location -SourceImageId $sourceImageId -ReplicaCount 1 -StorageAccountType $storageAccountType -TargetRegion $targetRegions
+$targetRegions = @($region_eastus, $region_ukwest)
+
+New-AzGalleryImageVersion -ResourceGroupName $rgName -GalleryName $galleryName -GalleryImageDefinitionName $galleryImageDefinitionName -Name $galleryImageVersionName -Location $location -SourceImageId $sourceImageId -ReplicaCount 1 -StorageAccountType "Standard_ZRS" -TargetRegion $targetRegions
 ```
 
 Create an image version in four regions. In this example, the global replica count is 1 and the global storage account type is Standard_ZRS. East US will have 3 replicas, each stored on Standard_LRS account storage. West US will inherit from global settings and have 1 replica stored on Standard_ZRS. UK West will have a replica count of 2 stored on Standard_ZRS. South Central US will have one replica stored on Standard_LRS.