fix vmss model with plan

Signed-off-by: Lukas Stehlik <stehlik.lukas@gmail.com>

Author: stelucz

azure/converters/vmss.go

@@ -68,7 +68,7 @@ func SDKToVMSS(sdkvmss armcompute.VirtualMachineScaleSet, sdkinstances []armcomp
 		sdkvmss.Properties.VirtualMachineProfile.StorageProfile != nil &&
 		sdkvmss.Properties.VirtualMachineProfile.StorageProfile.ImageReference != nil {
 		imageRef := sdkvmss.Properties.VirtualMachineProfile.StorageProfile.ImageReference
-		vmss.Image = SDKImageToImage(imageRef, sdkvmss.Plan != nil)
+		vmss.Image = SDKImageToImageWithPlan(imageRef, sdkvmss.Plan != nil, sdkvmss.Plan)
 	}
 
 	return vmss
@@ -95,7 +95,7 @@ func SDKVMToVMSSVM(sdkInstance armcompute.VirtualMachine, mode infrav1.Orchestra
 
 	if sdkInstance.Properties.StorageProfile != nil && sdkInstance.Properties.StorageProfile.ImageReference != nil {
 		imageRef := sdkInstance.Properties.StorageProfile.ImageReference
-		instance.Image = SDKImageToImage(imageRef, sdkInstance.Plan != nil)
+		instance.Image = SDKImageToImageWithPlan(imageRef, sdkInstance.Plan != nil, sdkInstance.Plan)
 	}
 
 	if len(sdkInstance.Zones) > 0 {
@@ -147,7 +147,7 @@ func SDKToVMSSVM(sdkInstance armcompute.VirtualMachineScaleSetVM) *azure.VMSSVM
 
 	if sdkInstance.Properties.StorageProfile != nil && sdkInstance.Properties.StorageProfile.ImageReference != nil {
 		imageRef := sdkInstance.Properties.StorageProfile.ImageReference
-		instance.Image = SDKImageToImage(imageRef, sdkInstance.Plan != nil)
+		instance.Image = SDKImageToImageWithPlan(imageRef, sdkInstance.Plan != nil, sdkInstance.Plan)
 	}
 
 	if len(sdkInstance.Zones) > 0 {
@@ -160,21 +160,57 @@ func SDKToVMSSVM(sdkInstance armcompute.VirtualMachineScaleSetVM) *azure.VMSSVM
 
 // SDKImageToImage converts a SDK image reference to infrav1.Image.
 func SDKImageToImage(sdkImageRef *armcompute.ImageReference, isThirdPartyImage bool) infrav1.Image {
+	return SDKImageToImageWithPlan(sdkImageRef, isThirdPartyImage, nil)
+}
+
+// SDKImageToImageWithPlan converts a SDK image reference to infrav1.Image and carries plan metadata where applicable.
+func SDKImageToImageWithPlan(sdkImageRef *armcompute.ImageReference, isThirdPartyImage bool, sdkPlan *armcompute.Plan) infrav1.Image {
 	if sdkImageRef.ID != nil {
-		return IDImageRefToImage(*sdkImageRef.ID)
+		return withPlan(IDImageRefToImage(*sdkImageRef.ID), sdkPlan)
 	}
 	// community gallery image
 	if sdkImageRef.CommunityGalleryImageID != nil {
-		return cgImageRefToImage(*sdkImageRef.CommunityGalleryImageID)
+		return withPlan(cgImageRefToImage(*sdkImageRef.CommunityGalleryImageID), sdkPlan)
 	}
 	// shared gallery image
 	if sdkImageRef.SharedGalleryImageID != nil {
-		return sgImageRefToImage(*sdkImageRef.SharedGalleryImageID)
+		return withPlan(sgImageRefToImage(*sdkImageRef.SharedGalleryImageID), sdkPlan)
 	}
 	// marketplace image
 	return mpImageRefToImage(sdkImageRef, isThirdPartyImage)
 }
 
+func withPlan(image infrav1.Image, sdkPlan *armcompute.Plan) infrav1.Image {
+	if sdkPlan == nil {
+		return image
+	}
+
+	publisher := ptr.Deref(sdkPlan.Publisher, "")
+	offer := ptr.Deref(sdkPlan.Product, "")
+	sku := ptr.Deref(sdkPlan.Name, "")
+
+	if image.ComputeGallery != nil {
+		if publisher != "" && offer != "" && sku != "" {
+			image.ComputeGallery.Plan = &infrav1.ImagePlan{
+				Publisher: publisher,
+				Offer:     offer,
+				SKU:       sku,
+			}
+		}
+		return image
+	}
+
+	if image.SharedGallery != nil {
+		if publisher != "" && offer != "" && sku != "" {
+			image.SharedGallery.Publisher = ptr.To(publisher)
+			image.SharedGallery.Offer = ptr.To(offer)
+			image.SharedGallery.SKU = ptr.To(sku)
+		}
+	}
+
+	return image
+}
+
 // GetOrchestrationMode returns the compute.OrchestrationMode for the given infrav1.OrchestrationModeType.
 func GetOrchestrationMode(modeType infrav1.OrchestrationModeType) armcompute.OrchestrationMode {
 	if modeType == infrav1.FlexibleOrchestrationMode {

azure/converters/vmss_test.go

@@ -218,6 +218,7 @@ func Test_SDKImageToImage(t *testing.T) {
 		Name         string
 		SDKImageRef  *armcompute.ImageReference
 		IsThirdParty bool
+		SDKPlan      *armcompute.Plan
 		Image        infrav1.Image
 	}{
 		{
@@ -239,6 +240,11 @@ func Test_SDKImageToImage(t *testing.T) {
 				Version:   ptr.To("version"),
 			},
 			IsThirdParty: true,
+			SDKPlan: &armcompute.Plan{
+				Publisher: ptr.To("publisher"),
+				Product:   ptr.To("offer"),
+				Name:      ptr.To("sku"),
+			},
 			Image: infrav1.Image{
 				Marketplace: &infrav1.AzureMarketplaceImage{
 					ImagePlan: infrav1.ImagePlan{
@@ -294,6 +300,31 @@ func Test_SDKImageToImage(t *testing.T) {
 				},
 			},
 		},
+		{
+			Name: "compute gallery image with plan",
+			SDKImageRef: &armcompute.ImageReference{
+				ID: ptr.To("/subscriptions/subscription/resourceGroups/rg/providers/Microsoft.Compute/galleries/gallery/images/image/versions/version"),
+			},
+			SDKPlan: &armcompute.Plan{
+				Publisher: ptr.To("publisher"),
+				Product:   ptr.To("product"),
+				Name:      ptr.To("sku"),
+			},
+			Image: infrav1.Image{
+				ComputeGallery: &infrav1.AzureComputeGalleryImage{
+					Gallery:        "gallery",
+					Name:           "image",
+					Version:        "version",
+					SubscriptionID: ptr.To("subscription"),
+					ResourceGroup:  ptr.To("rg"),
+					Plan: &infrav1.ImagePlan{
+						Publisher: "publisher",
+						Offer:     "product",
+						SKU:       "sku",
+					},
+				},
+			},
+		},
 		{
 			Name: "compute gallery image not formatted as expected",
 			SDKImageRef: &armcompute.ImageReference{
@@ -316,6 +347,10 @@ func Test_SDKImageToImage(t *testing.T) {
 		t.Run(c.Name, func(t *testing.T) {
 			t.Parallel()
 			g := gomega.NewGomegaWithT(t)
+			if c.SDKPlan != nil {
+				g.Expect(converters.SDKImageToImageWithPlan(c.SDKImageRef, c.IsThirdParty, c.SDKPlan)).To(gomega.Equal(c.Image))
+				return
+			}
 			g.Expect(converters.SDKImageToImage(c.SDKImageRef, c.IsThirdParty)).To(gomega.Equal(c.Image))
 		})
 	}