4.10.3

internal/service/cloudbroker/disks/old_schemas.go

@@ -0,0 +1,391 @@
+package disks
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+)
+
+func resourceDiskV1() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"account_id": {
+				Type:     schema.TypeInt,
+				Required: true,
+				//ForceNew: true,
+			},
+			"gid": {
+				Type:     schema.TypeInt,
+				Required: true,
+				//ForceNew: true,
+			},
+			"disk_name": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"type": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validation.StringInSlice([]string{"D", "B", "T"}, false),
+				Description:  "The type of disk in terms of its role in compute: 'B=Boot, D=Data, T=Temp'",
+			},
+
+			"desc": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"size_max": {
+				Type:     schema.TypeInt,
+				Required: true,
+			},
+			"ssd_size": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
+			"iops": {
+				Type:        schema.TypeInt,
+				Optional:    true,
+				Description: "max IOPS disk can perform",
+			},
+			"sep_id": {
+				Type:     schema.TypeInt,
+				Optional: true,
+				Computed: true,
+			},
+			"pool": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"node_ids": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"detach": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "detach disk from machine first",
+			},
+			"permanently": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "whether to completely delete the disk, works only with non attached disks",
+			},
+			"shareable": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Computed: true,
+			},
+			"restore": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "restore deleting disk",
+			},
+			"account_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"acl": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"boot_partition": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"computes": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"compute_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"compute_name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"created_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"deleted_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"destruction_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"devicename": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"disk_path": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"guid": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"disk_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"image_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"images": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"iotune": {
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"read_bytes_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"read_bytes_sec_max": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"read_iops_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"read_iops_sec_max": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"size_iops_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"total_bytes_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"total_bytes_sec_max": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"total_iops_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"total_iops_sec_max": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"write_bytes_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"write_bytes_sec_max": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"write_iops_sec": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+						"write_iops_sec_max": {
+							Type:     schema.TypeInt,
+							Optional: true,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"iqn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"login": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"milestones": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+
+			"order": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"params": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"parent_id": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"passwd": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"pci_slot": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"present_to": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeInt,
+				},
+			},
+			"purge_attempts": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"purge_time": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"replication": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"disk_id": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"pool_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"role": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"self_volume_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"storage_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"volume_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+				Description: "Replication status",
+			},
+			"reality_device_number": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"reference_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"res_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"res_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"role": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"sep_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"size_used": {
+				Type:     schema.TypeFloat,
+				Computed: true,
+			},
+			"snapshots": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"guid": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"label": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"reference_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"res_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"snap_set_guid": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"snap_set_time": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+						"timestamp": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
+					},
+				},
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"tech_status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"vmid": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+		},
+	}
+}

internal/service/cloudbroker/disks/resource_disk.go

@@ -418,7 +418,7 @@ func resourceDiskChangeNodes(ctx context.Context, d *schema.ResourceData, m inte
 
 func ResourceDisk() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceDiskCreate,
 		ReadContext:   resourceDiskRead,
@@ -438,5 +438,12 @@ func ResourceDisk() *schema.Resource {
 		},
 
 		Schema: resourceDiskSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceDiskV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourceDiskUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudbroker/disks/state_upgrader.go

@@ -0,0 +1,14 @@
+package disks
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func resourceDiskUpgradeV1(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) {
+	log.Debug("resourceDiskUpgradeV1: upgrading state")
+	rawState["present_to"] = make(map[string]uint64)
+
+	return rawState, nil
+}

internal/service/cloudbroker/image/resource_cdrom_image.go

@@ -207,7 +207,7 @@ func resourceImageCDROMEdit(ctx context.Context, d *schema.ResourceData, m inter
 
 func ResourceCDROMImage() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceCDROMImageCreate,
 		ReadContext:   resourceCDROMImageRead,
@@ -227,5 +227,12 @@ func ResourceCDROMImage() *schema.Resource {
 		},
 
 		Schema: resourceCDROMImageSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceCDROMImageV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentTOUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudbroker/image/resource_image.go

@@ -356,7 +356,7 @@ func resourceImageEdit(ctx context.Context, d *schema.ResourceData, m interface{
 
 func ResourceImage() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceImageCreate,
 		ReadContext:   resourceImageRead,
@@ -376,5 +376,12 @@ func ResourceImage() *schema.Resource {
 		},
 
 		Schema: resourceImageSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceImageV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentTOUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudbroker/image/resource_image_from_blank_compute.go

@@ -254,7 +254,7 @@ func resourceImageFromBlankComputeUpdate(ctx context.Context, d *schema.Resource
 
 func ResourceImageFromBlankCompute() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceImageFromBlankComputeCreate,
 		ReadContext:   resourceImageFromBlankComputeRead,
@@ -274,5 +274,12 @@ func ResourceImageFromBlankCompute() *schema.Resource {
 		},
 
 		Schema: resourceImageFromBlankComputeSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceImageFromBlankComputeV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentTOUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudbroker/image/resource_image_from_platform_disk.go

@@ -256,7 +256,7 @@ func resourceImageFromPlatformDiskUpdate(ctx context.Context, d *schema.Resource
 
 func ResourceImageFromPlatformDisk() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceImageFromPlatformDiskCreate,
 		ReadContext:   resourceImageFromPlatformDiskRead,
@@ -276,5 +276,12 @@ func ResourceImageFromPlatformDisk() *schema.Resource {
 		},
 
 		Schema: resourceImageFromPlatformDiskSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceImageFromPlatformDiskV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentTOUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudbroker/image/resource_virtual_image.go

@@ -183,7 +183,7 @@ func resourceImageLink(ctx context.Context, d *schema.ResourceData, m interface{
 
 func ResourceVirtualImage() *schema.Resource {
 	return &schema.Resource{
-		SchemaVersion: 1,
+		SchemaVersion: 2,
 
 		CreateContext: resourceVirtualImageCreate,
 		ReadContext:   resourceVirtualImageRead,
@@ -203,5 +203,12 @@ func ResourceVirtualImage() *schema.Resource {
 		},
 
 		Schema: resourceVirtualImageSchemaMake(),
+		StateUpgraders: []schema.StateUpgrader{
+			{
+				Type:    resourceVirtualImageV1().CoreConfigSchema().ImpliedType(),
+				Upgrade: resourcePresentTOUpgradeV1,
+				Version: 1,
+			},
+		},
 	}
 }

internal/service/cloudbroker/image/state_upgrader.go

@@ -0,0 +1,14 @@
+package image
+
+import (
+	"context"
+
+	log "github.com/sirupsen/logrus"
+)
+
+func resourcePresentTOUpgradeV1(ctx context.Context, rawState map[string]interface{}, meta any) (map[string]interface{}, error) {
+	log.Debug("resourcePresentTOUpgradeV1: upgrading state")
+	rawState["present_to"] = make(map[string]uint64)
+
+	return rawState, nil
+}