Fix disk offering create when neither disk_size nor customized is set

Author: bddvlpr

cloudstack/data_source_cloudstack_disk_offering.go

@@ -156,10 +156,11 @@ func applyDiskOfferingFilters(diskOffering *cloudstack.DiskOffering, filters *sc
 			return false, fmt.Errorf("Invalid regex: %s", err)
 		}
 		updatedName := strings.ReplaceAll(m["name"].(string), "_", "")
-		diskOfferingField, ok := diskOfferingJSON[updatedName].(string)
+		raw, ok := diskOfferingJSON[updatedName]
 		if !ok {
-			return false, fmt.Errorf("Field %s is not a string and cannot be filtered", m["name"].(string))
+			return false, fmt.Errorf("Unknown filter field %s", m["name"].(string))
 		}
+		diskOfferingField := fmt.Sprint(raw)
 		if !r.MatchString(diskOfferingField) {
 			return false, nil
 		}

cloudstack/resource_cloudstack_disk_offering.go

@@ -119,9 +119,14 @@ func resourceCloudStackDiskOfferingCreate(d *schema.ResourceData, meta interface
 		p.SetDisksize(int64(v.(int)))
 	}
 
+	customized := false
 	if v, ok := d.GetOk("customized"); ok {
-		p.SetCustomized(v.(bool))
+		customized = v.(bool)
 	}
+	if _, ok := d.GetOk("disk_size"); !ok {
+		customized = true
+	}
+	p.SetCustomized(customized)
 
 	if v, ok := d.GetOk("storage_type"); ok {
 		p.SetStoragetype(v.(string))

cloudstack/resource_cloudstack_disk_offering_test.go

@@ -45,6 +45,11 @@ func TestAccCloudStackDiskOffering_basic(t *testing.T) {
 					resource.TestCheckResourceAttr("cloudstack_disk_offering.test1", "storage_type", "shared"),
 				),
 			},
+			{
+				ResourceName:      "cloudstack_disk_offering.test1",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }

website/docs/r/disk_offering.html.markdown

@@ -28,10 +28,12 @@ The following arguments are supported:
 * `name` - (Required) The name of the disk offering.
 * `display_text` - (Required) The display text of the disk offering.
 * `disk_size` - (Optional) The size of the disk offering in GB. Conflicts with
-    `customized`. Changing this forces a new resource to be created.
+    `customized`. If neither `disk_size` nor `customized` is set, the offering is
+    created as customized. Changing this forces a new resource to be created.
 * `customized` - (Optional) Whether the disk offering allows a custom disk size
-    to be specified at deployment time. Conflicts with `disk_size`. Defaults to
-    `false`. Changing this forces a new resource to be created.
+    to be specified at deployment time. Conflicts with `disk_size`, and is
+    implied when `disk_size` is omitted. Defaults to `false`. Changing this
+    forces a new resource to be created.
 * `storage_type` - (Optional) The storage type of the disk offering. Values are
     `local` and `shared`. Defaults to `shared`. Changing this forces a new
     resource to be created.