Add disk type in cloud project data

Author: Galiley

ovh/data_cloud_project_database.go

@@ -157,6 +157,16 @@ func dataSourceCloudProjectDatabase() *schema.Resource {
 				Description: "Version of the engine deployed on the cluster",
 				Computed:    true,
 			},
+			"disk_size": {
+				Type:        schema.TypeInt,
+				Description: "Disk size attributes of the cluster",
+				Computed:    true,
+			},
+			"disk_type": {
+				Type:        schema.TypeInt,
+				Description: "Disk type attributes of the cluster",
+				Computed:    true,
+			},
 		},
 	}
 }

ovh/resource_cloud_project_database.go

@@ -186,6 +186,11 @@ func resourceCloudProjectDatabase() *schema.Resource {
 				Optional:     true,
 				ValidateFunc: validateCloudProjectDatabaseDiskSize,
 			},
+			"disk_type": {
+				Type:        schema.TypeInt,
+				Description: "Disk type attributes of the cluster",
+				Computed:    true,
+			},
 		},
 	}
 }

ovh/types_cloud_project_database.go

@@ -11,7 +11,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/ovh/go-ovh/ovh"
-	"github.com/ovh/terraform-provider-ovh/ovh/helpers"
 	"github.com/ybriffa/rfc3339"
 )
 
@@ -73,7 +72,8 @@ func (v CloudProjectDatabaseResponse) ToMap() map[string]interface{} {
 	obj["plan"] = v.Plan
 	obj["status"] = v.Status
 	obj["version"] = v.Version
-	obj["disk"] = v.Disk.ToMap()
+	obj["disk_size"] = v.Disk.Size
+	obj["disk_type"] = v.Disk.Type
 
 	return obj
 }
@@ -140,14 +140,7 @@ type CloudProjectDatabaseCreateOpts struct {
 
 type CloudProjectDatabaseDisk struct {
 	Type string `json:"type,omitempty"`
-	Size *int   `json:"size,omitempty"`
-}
-
-func (cpdd *CloudProjectDatabaseDisk) ToMap() map[string]interface{} {
-	obj := make(map[string]interface{})
-	obj["size"] = cpdd.Size
-	obj["type"] = cpdd.Type
-	return obj
+	Size int    `json:"size,omitempty"`
 }
 
 func validateCloudProjectDatabaseDiskSize(v interface{}, k string) (ws []string, errors []error) {
@@ -184,7 +177,7 @@ func (opts *CloudProjectDatabaseCreateOpts) FromResource(d *schema.ResourceData)
 	opts.NetworkId = nodes[0].NetworkId
 	opts.SubnetId = nodes[0].SubnetId
 	opts.Version = d.Get("version").(string)
-	opts.Disk = CloudProjectDatabaseDisk{Size: helpers.GetNilIntPointer(d.Get("disk_size"))}
+	opts.Disk = CloudProjectDatabaseDisk{Size: d.Get("disk_size").(int)}
 	return nil, opts
 }
 
@@ -211,7 +204,7 @@ func (opts *CloudProjectDatabaseUpdateOpts) FromResource(d *schema.ResourceData)
 	opts.Plan = d.Get("plan").(string)
 	opts.Flavor = d.Get("flavor").(string)
 	opts.Version = d.Get("version").(string)
-	opts.Disk = CloudProjectDatabaseDisk{Size: helpers.GetNilIntPointer(d.Get("disk_size"))}
+	opts.Disk = CloudProjectDatabaseDisk{Size: d.Get("disk_size").(int)}
 	return nil, opts
 }
 

website/docs/d/cloud_project_database.html.markdown

@@ -68,3 +68,5 @@ The following attributes are exported:
 * `plan` - Plan of the cluster.
 * `status` - Current status of the cluster.
 * `version` - The version of the engine in which the service should be deployed
+* `disk_size` - Defines the disk size of the database service.
+* `disk_type` -  Defines the disk type of the database service.

website/docs/r/cloud_project_database.html.markdown

@@ -246,6 +246,7 @@ The following attributes are exported:
 * `status` - Current status of the cluster.
 * `version` - See Argument Reference above.
 * `disk_size` - See Argument Reference above.
+* `disk_type` -  Defines the disk type of the database service.
 
 ## Timeouts