Cplat sigcmk bug (#16010)

* update

* update

* Update ChangeLog.md

Co-authored-by: Yunchi Wang <[email protected]>

Author: grizzlytheodore

src/Compute/Compute/ChangeLog.md

@@ -20,6 +20,7 @@
 
 -->
 ## Upcoming Release
+* Updated New-AzGalleryImageVersion to take in the 'Encryption' property correctly from '-TagetRegion' parameter. 
 * Updated 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/Generated/GalleryImageVersion/GalleryImageVersionCreateOrUpdateMethod.cs

@@ -137,8 +137,27 @@ public override void ExecuteCmdlet()
                                 Name = (string)t["Name"],
                                 RegionalReplicaCount = (int?)t["ReplicaCount"],
                                 StorageAccountType = (string)t["StorageAccountType"],
-                                Encryption = (t["Encryption"] == null) ? (EncryptionImages)t["Encryption"] : null
                             };
+                            if (t["Encryption"] != null)
+                            {
+                                var osDiskEncryptionSetId = (string)((Hashtable)((Hashtable)t["Encryption"])["osDiskImage"])["DiskEncryptionSetId"];
+                                var osDiskImageEncryption = new OSDiskImageEncryption(osDiskEncryptionSetId);
+
+                                List<DataDiskImageEncryption> dataDiskImageEncryption = null;
+                                var dataDiskImage = (object[])((Hashtable)t["Encryption"])["dataDiskImages"];
+                                
+                                if (dataDiskImage != null)
+                                {
+                                    dataDiskImageEncryption = new List<DataDiskImageEncryption>();
+                                    foreach (Hashtable dataDiskEncryptionSetId in dataDiskImage)
+                                    {
+                                        DataDiskImageEncryption d = new DataDiskImageEncryption((int)dataDiskEncryptionSetId["Lun"], (string)dataDiskEncryptionSetId["DiskEncryptionSetId"]);
+                                        dataDiskImageEncryption.Add(d);
+                                    }
+                                }
+                                
+                                target.Encryption = new EncryptionImages(osDiskImageEncryption, dataDiskImageEncryption);
+                            }
 
                             galleryImageVersion.PublishingProfile.TargetRegions.Add(target);
                         }
@@ -332,8 +351,27 @@ public override void ExecuteCmdlet()
                                 Name = (string)t["Name"],
                                 RegionalReplicaCount = (int?)t["ReplicaCount"],
                                 StorageAccountType = (string)t["StorageAccountType"],
-                                Encryption = (t["Encryption"] == null) ? (EncryptionImages)t["Encryption"] : null
                             };
+                            if (t["Encryption"] != null)
+                            {
+                                var osDiskEncryptionSetId = (string)((Hashtable)((Hashtable)t["Encryption"])["osDiskImage"])["DiskEncryptionSetId"];
+                                var osDiskImageEncryption = new OSDiskImageEncryption(osDiskEncryptionSetId);
+
+                                List<DataDiskImageEncryption> dataDiskImageEncryption = null;
+                                var dataDiskImage = (object[])((Hashtable)t["Encryption"])["dataDiskImages"];
+
+                                if (dataDiskImage != null)
+                                {
+                                    dataDiskImageEncryption = new List<DataDiskImageEncryption>();
+                                    foreach (Hashtable dataDiskEncryptionSetId in dataDiskImage)
+                                    {
+                                        DataDiskImageEncryption d = new DataDiskImageEncryption((int)dataDiskEncryptionSetId["Lun"], (string)dataDiskEncryptionSetId["DiskEncryptionSetId"]);
+                                        dataDiskImageEncryption.Add(d);
+                                    }
+                                }
+
+                                target.Encryption = new EncryptionImages(osDiskImageEncryption, dataDiskImageEncryption);
+                            }
 
                             galleryImageVersion.PublishingProfile.TargetRegions.Add(target);
                         }