[Compute] SharedGalleryImageId bug fix for New-Azvmss, New-Azvm (#23145)

* changes * bug fix * Adding changelog
Azure · Nov 7, 2023 · 3d4fb23 · 3d4fb23
1 parent 944d498
commit 3d4fb23
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 16 deletions.
diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md
@@ -26,6 +26,7 @@
 * Removed unversioned and outdated images from New-AzVmss `-ImageName` argument completers.
 * Added new parameters `-ElasticSanResourceId` and `-OptimizedForFrequentAttach` to `New-AzDiskConfig` cmdlet.
 * Added new parameter `-ElasticSanResourceId` to `New-AzSnapshotConfig` cmdlet.
+* Fixed `New-AzVmss` and `New-Azvm` to use `SharedGalleryImageId` parameter.
 
 ## Version 6.3.0
 * Added `-Hibernate` switch parameter to `Stop-AzVmss` default parameter set. 

diff --git a/src/Compute/Compute/Strategies/ComputeRp/VirtualMachineScaleSetStrategy.cs b/src/Compute/Compute/Strategies/ComputeRp/VirtualMachineScaleSetStrategy.cs
@@ -117,15 +117,23 @@ internal static ResourceConfig<VirtualMachineScaleSet> CreateVirtualMachineScale
                             },
                             StorageProfile = new VirtualMachineScaleSetStorageProfile
                             {
-                                ImageReference = (imageReferenceId == null) ? imageAndOsType?.Image : (imageReferenceId.ToLower().StartsWith("/communitygalleries/") ? new ImageReference
+                                ImageReference = (imageReferenceId == null && sharedImageGalleryId == null) ? imageAndOsType?.Image 
+                                : (sharedImageGalleryId != null ? new ImageReference
                                 {
-                                    CommunityGalleryImageId = imageReferenceId,
                                     SharedGalleryImageId = sharedImageGalleryId
-                                } : new ImageReference
+                                }
+                                : (imageReferenceId.ToLower().StartsWith("/communitygalleries/") ? new ImageReference
                                 {
-                                    Id = imageReferenceId,
-                                    SharedGalleryImageId = sharedImageGalleryId
-                                }),
+                                    CommunityGalleryImageId = imageReferenceId,
+                                } 
+                                : (imageReferenceId.ToLower().StartsWith("/sharedgalleries/") ? new ImageReference
+                                {
+                                    SharedGalleryImageId = imageReferenceId
+                                }
+                                : new ImageReference
+                                {
+                                    Id = imageReferenceId
+                                }))),
                                 DataDisks = DataDiskStrategy.CreateVmssDataDisks(
                                     imageAndOsType?.DataDiskLuns, dataDisks),
                                 DiskControllerType = diskControllerType

diff --git a/src/Compute/Compute/Strategies/ComputeRp/VirtualMachineStrategy.cs b/src/Compute/Compute/Strategies/ComputeRp/VirtualMachineStrategy.cs
@@ -116,16 +116,23 @@ public static ResourceConfig<VirtualMachine> CreateVirtualMachineConfig(
                         },
                         StorageProfile = new StorageProfile
                         {
-                            //ImageReference = (imageReferenceId.Contains("CommunityGalleries")) ? new ImageReference { CommunityGalleryImageId = imageReferenceId}
-                            ImageReference = (imageReferenceId == null) ? imageAndOsType?.Image : (imageReferenceId.ToLower().StartsWith("/communitygalleries/") ? new ImageReference
-                            {
-                                CommunityGalleryImageId = imageReferenceId,
-                                SharedGalleryImageId = sharedGalleryImageId
-                            }: new ImageReference
-                            {
-                                Id = imageReferenceId,
-                                SharedGalleryImageId = sharedGalleryImageId
-                            }),
+                            ImageReference = (imageReferenceId == null && sharedGalleryImageId == null) ? imageAndOsType?.Image
+                                : (sharedGalleryImageId != null ? new ImageReference
+                                {
+                                    SharedGalleryImageId = sharedGalleryImageId
+                                }
+                                : (imageReferenceId.ToLower().StartsWith("/communitygalleries/") ? new ImageReference
+                                {
+                                    CommunityGalleryImageId = imageReferenceId,
+                                }
+                                : (imageReferenceId.ToLower().StartsWith("/sharedgalleries/") ? new ImageReference
+                                {
+                                    SharedGalleryImageId = imageReferenceId
+                                }
+                                : new ImageReference
+                                {
+                                    Id = imageReferenceId
+                                }))),
                             OsDisk = new OSDisk(
                                 createOption: DiskCreateOptionTypes.FromImage,
                                 deleteOption: osDiskDeleteOption),