Merge pull request #333 from Galiley/set_disk_size_on_cluster_creation

Add disk in database resource creation

Author: scraly

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.TypeString,
+				Description: "Disk type attributes of the cluster",
+				Computed:    true,
+			},
 		},
 	}
 }

ovh/resource_cloud_project_database.go

@@ -180,6 +180,17 @@ func resourceCloudProjectDatabase() *schema.Resource {
 				Description: "Current status of the cluster",
 				Computed:    true,
 			},
+			"disk_size": {
+				Type:         schema.TypeInt,
+				Description:  "Disk size attributes of the cluster",
+				Optional:     true,
+				ValidateFunc: validateCloudProjectDatabaseDiskSize,
+			},
+			"disk_type": {
+				Type:        schema.TypeString,
+				Description: "Disk type attributes of the cluster",
+				Computed:    true,
+			},
 		},
 	}
 }

ovh/types_cloud_project_database.go

@@ -32,6 +32,7 @@ type CloudProjectDatabaseResponse struct {
 	Status          string                         `json:"status"`
 	SubnetId        string                         `json:"subnetId"`
 	Version         string                         `json:"version"`
+	Disk            CloudProjectDatabaseDisk       `json:"disk"`
 }
 
 func (s *CloudProjectDatabaseResponse) String() string {
@@ -71,6 +72,8 @@ func (v CloudProjectDatabaseResponse) ToMap() map[string]interface{} {
 	obj["plan"] = v.Plan
 	obj["status"] = v.Status
 	obj["version"] = v.Version
+	obj["disk_size"] = v.Disk.Size
+	obj["disk_type"] = v.Disk.Type
 
 	return obj
 }
@@ -129,11 +132,22 @@ type CloudProjectDatabaseCreateOpts struct {
 	Description  string                           `json:"description,omitempty"`
 	NetworkId    string                           `json:"networkId,omitempty"`
 	NodesPattern CloudProjectDatabaseNodesPattern `json:"nodesPattern,omitempty"`
+	Disk         CloudProjectDatabaseDisk         `json:"disk,omitempty"`
 	Plan         string                           `json:"plan"`
 	SubnetId     string                           `json:"subnetId,omitempty"`
 	Version      string                           `json:"version"`
 }
 
+type CloudProjectDatabaseDisk struct {
+	Type string `json:"type,omitempty"`
+	Size int    `json:"size,omitempty"`
+}
+
+func validateCloudProjectDatabaseDiskSize(v interface{}, k string) (ws []string, errors []error) {
+	errors = validateIsSupEqual(v.(int), 0)
+	return
+}
+
 type CloudProjectDatabaseNodesPattern struct {
 	Flavor string `json:"flavor"`
 	Number int    `json:"number"`
@@ -163,17 +177,18 @@ 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: d.Get("disk_size").(int), Type: d.Get("disk_type").(string)}
 	return nil, opts
 }
 
 type CloudProjectDatabaseUpdateOpts struct {
-	AclsEnabled bool   `json:"aclsEnabled,omitempty"`
-	Description string `json:"description,omitempty"`
-	Flavor      string `json:"flavor,omitempty"`
-	Plan        string `json:"plan,omitempty"`
-	RestApi     bool   `json:"restApi,omitempty"`
-	Version     string `json:"version,omitempty"`
+	AclsEnabled bool                     `json:"aclsEnabled,omitempty"`
+	Description string                   `json:"description,omitempty"`
+	Flavor      string                   `json:"flavor,omitempty"`
+	Plan        string                   `json:"plan,omitempty"`
+	RestApi     bool                     `json:"restApi,omitempty"`
+	Version     string                   `json:"version,omitempty"`
+	Disk        CloudProjectDatabaseDisk `json:"disk,omitempty"`
 }
 
 func (opts *CloudProjectDatabaseUpdateOpts) FromResource(d *schema.ResourceData) (error, *CloudProjectDatabaseUpdateOpts) {
@@ -189,6 +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: d.Get("disk_size").(int), Type: d.Get("disk_type").(string)}
 	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` - The disk size (in GB) of the database service.
+* `disk_type` -  The disk type of the database service.

website/docs/r/cloud_project_database.html.markdown

@@ -207,6 +207,8 @@ The following arguments are supported:
 
 * `opensearch_acls_enabled` -  (Optional) Defines whether the ACLs are enabled on an OpenSearch cluster
 
+* `disk_size` -  (Optional) The disk size (in GB) of the database service.
+
 * `plan` - (Required) Plan of the cluster.
   Enum: "essential", "business", "enterprise".
 
@@ -243,6 +245,8 @@ The following attributes are exported:
 * `plan` - See Argument Reference above.
 * `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