Fix

kubernetes · Jan 6, 2025 · f74f64b · f74f64b
1 parent 34a99db
commit f74f64b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/upup/pkg/fi/cloudup/azuretasks/disk.go b/upup/pkg/fi/cloudup/azuretasks/disk.go
@@ -35,7 +35,7 @@ type Disk struct {
 	ResourceGroup *ResourceGroup
 	SizeGB        *int32
 	Tags          map[string]*string
-	VolumeType    *compute.DiskStorageAccountTypes
+	VolumeType    *string
 	Zones         []*string
 }
 
@@ -74,10 +74,13 @@ func (d *Disk) Find(c *fi.CloudupContext) (*Disk, error) {
 		ResourceGroup: &ResourceGroup{
 			Name: d.ResourceGroup.Name,
 		},
-		SizeGB:     found.Properties.DiskSizeGB,
-		Tags:       found.Tags,
-		VolumeType: found.SKU.Name,
-		Zones:      found.Zones,
+		SizeGB: found.Properties.DiskSizeGB,
+		Tags:   found.Tags,
+		Zones:  found.Zones,
+	}
+	if found.SKU != nil && found.SKU.Name != nil {
+		volumeType := string(*found.SKU.Name)
+		disk.VolumeType = &volumeType
 	}
 	if found.Properties != nil {
 		disk.SizeGB = found.Properties.DiskSizeGB
@@ -131,7 +134,7 @@ func (*Disk) RenderAzure(t *azure.AzureAPITarget, a, e, changes *Disk) error {
 			DiskSizeGB: e.SizeGB,
 		},
 		SKU: &compute.DiskSKU{
-			Name: e.VolumeType,
+			Name: (*compute.DiskStorageAccountTypes)(e.VolumeType),
 		},
 		Tags:  e.Tags,
 		Zones: e.Zones,

diff --git a/upup/pkg/fi/cloudup/azuretasks/disk_test.go b/upup/pkg/fi/cloudup/azuretasks/disk_test.go
@@ -29,8 +29,9 @@ import (
 )
 
 const (
-	testTagKey   = "key"
-	testTagValue = "value"
+	testTagKey     = "key"
+	testTagValue   = "value"
+	testVolumeType = "StandardSSD_LRS"
 )
 
 func newTestDisk() *Disk {
@@ -40,10 +41,8 @@ func newTestDisk() *Disk {
 		ResourceGroup: &ResourceGroup{
 			Name: to.Ptr("rg"),
 		},
-		SizeGB: to.Ptr[int32](32),
-		VolumeType: &compute.DiskSKU{
-			Name: to.Ptr(compute.DiskStorageAccountTypesStandardSSDLRS),
-		},
+		SizeGB:     to.Ptr[int32](32),
+		VolumeType: to.Ptr(testVolumeType),
 		Tags: map[string]*string{
 			testTagKey: to.Ptr(testTagValue),
 		},