Skip to content

Commit d7827b2

Browse files
update
1 parent 00833d6 commit d7827b2

File tree

2 files changed

+34
-6
lines changed

2 files changed

+34
-6
lines changed

src/Compute/Compute/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
-->
2222
## Upcoming Release
23+
* Update New-AzGalleryImageVersion to take in the 'Encryption' property correctly from '-TagetRegion' parameter.
2324
* Update Compute .NET SDK package reference to version 49.1.0
2425
* Fixed a bug in `Get-AzVM` that caused incorrect power status output.
2526

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

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,22 @@ public override void ExecuteCmdlet()
141141
if (t["Encryption"] != null)
142142
{
143143
var osDiskEncryptionSetId = (string)((Hashtable)((Hashtable)t["Encryption"])["osDiskImage"])["DiskEncryptionSetId"];
144-
var dataDiskEncryptionSetIds = new List<DataDiskImageEncryption>();
145-
var osDiskImage = new OSDiskImageEncryption(osDiskEncryptionSetId);
146-
target.Encryption = new EncryptionImages(osDiskImage, dataDiskImage);
144+
var osDiskImageEncryption = new OSDiskImageEncryption(osDiskEncryptionSetId);
145+
146+
List<DataDiskImageEncryption> dataDiskImageEncryption = null;
147+
var dataDiskImage = (object[])((Hashtable)t["Encryption"])["dataDiskImages"];
148+
149+
if (dataDiskImage != null)
150+
{
151+
dataDiskImageEncryption = new List<DataDiskImageEncryption>();
152+
foreach (Hashtable dataDiskEncryptionSetId in dataDiskImage)
153+
{
154+
DataDiskImageEncryption d = new DataDiskImageEncryption((int)dataDiskEncryptionSetId["Lun"], (string)dataDiskEncryptionSetId["DiskEncryptionSetId"]);
155+
dataDiskImageEncryption.Add(d);
156+
}
157+
}
158+
159+
target.Encryption = new EncryptionImages(osDiskImageEncryption, dataDiskImageEncryption);
147160
}
148161

149162
galleryImageVersion.PublishingProfile.TargetRegions.Add(target);
@@ -341,9 +354,23 @@ public override void ExecuteCmdlet()
341354
};
342355
if (t["Encryption"] != null)
343356
{
344-
var EncryptionSetId = (string)((Hashtable)((Hashtable)t["Encryption"])["osDiskImage"])["DiskEncryptionSetId"];
345-
var osDiskImage = new OSDiskImageEncryption(EncryptionSetId);
346-
target.Encryption = new EncryptionImages(osDiskImage);
357+
var osDiskEncryptionSetId = (string)((Hashtable)((Hashtable)t["Encryption"])["osDiskImage"])["DiskEncryptionSetId"];
358+
var osDiskImageEncryption = new OSDiskImageEncryption(osDiskEncryptionSetId);
359+
360+
List<DataDiskImageEncryption> dataDiskImageEncryption = null;
361+
var dataDiskImage = (object[])((Hashtable)t["Encryption"])["dataDiskImages"];
362+
363+
if (dataDiskImage != null)
364+
{
365+
dataDiskImageEncryption = new List<DataDiskImageEncryption>();
366+
foreach (Hashtable dataDiskEncryptionSetId in dataDiskImage)
367+
{
368+
DataDiskImageEncryption d = new DataDiskImageEncryption((int)dataDiskEncryptionSetId["Lun"], (string)dataDiskEncryptionSetId["DiskEncryptionSetId"]);
369+
dataDiskImageEncryption.Add(d);
370+
}
371+
}
372+
373+
target.Encryption = new EncryptionImages(osDiskImageEncryption, dataDiskImageEncryption);
347374
}
348375

349376
galleryImageVersion.PublishingProfile.TargetRegions.Add(target);

0 commit comments

Comments
 (0)