cloud Databases Custom backup (#553)

* add aditional backup regions field

Author: lpatte

ovh/data_cloud_project_database.go

@@ -31,6 +31,12 @@ func dataSourceCloudProjectDatabase() *schema.Resource {
 			},
 
 			//Computed
+			"backup_regions": {
+				Type:        schema.TypeList,
+				Description: "List of region where backups are pushed",
+				Computed:    true,
+				Elem:        &schema.Schema{Type: schema.TypeString},
+			},
 			"backup_time": {
 				Type:        schema.TypeString,
 				Description: "Time on which backups start every day",

ovh/data_cloud_project_database_test.go

@@ -54,6 +54,8 @@ func TestAccCloudProjectDatabaseDataSource_basic(t *testing.T) {
 			{
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(
+						"data.ovh_cloud_project_database.db", "backup_regions.#"),
 					resource.TestCheckResourceAttrSet(
 						"data.ovh_cloud_project_database.db", "backup_time"),
 					resource.TestCheckResourceAttrSet(

ovh/resource_cloud_project_database.go

@@ -108,6 +108,19 @@ func resourceCloudProjectDatabase() *schema.Resource {
 			},
 
 			//Optional/Computed
+			"backup_regions": {
+				Type:        schema.TypeList,
+				Description: "List of region where backups are pushed. Not more than 1 regions for MongoDB. Not more than 2 regions for the other engines with one being the same as the nodes[].region field",
+				Optional:    true,
+				Computed:    true,
+				Elem:        &schema.Schema{Type: schema.TypeString},
+			},
+			"backup_time": {
+				Type:        schema.TypeString,
+				Description: "Time on which backups start every day",
+				Optional:    true,
+				Computed:    true,
+			},
 			"disk_size": {
 				Type:         schema.TypeInt,
 				Description:  "Disk size attributes of the cluster",
@@ -129,11 +142,6 @@ func resourceCloudProjectDatabase() *schema.Resource {
 			},
 
 			//Computed
-			"backup_time": {
-				Type:        schema.TypeString,
-				Description: "Time on which backups start every day",
-				Computed:    true,
-			},
 			"created_at": {
 				Type:        schema.TypeString,
 				Description: "Date of the creation of the cluster",

ovh/resource_cloud_project_database_test.go

@@ -106,6 +106,8 @@ func TestAccCloudProjectDatabase_basic(t *testing.T) {
 			{
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(
+						"ovh_cloud_project_database.db", "backup_regions.#"),
 					resource.TestCheckResourceAttrSet(
 						"ovh_cloud_project_database.db", "backup_time"),
 					resource.TestCheckResourceAttrSet(

ovh/types_cloud_project_database.go

@@ -27,9 +27,14 @@ func diagnosticsToError(diags diag.Diagnostics) error {
 	return nil
 }
 
+type CloudProjectDatabaseBackups struct {
+	Regions []string `json:"regions,omitempty"`
+	Time    string   `json:"time,omitempty"`
+}
+
 type CloudProjectDatabaseResponse struct {
 	AclsEnabled           bool                           `json:"aclsEnabled"`
-	BackupTime            string                         `json:"backupTime"`
+	Backups               CloudProjectDatabaseBackups    `json:"backups"`
 	CreatedAt             string                         `json:"createdAt"`
 	Description           string                         `json:"description"`
 	Endpoints             []CloudProjectDatabaseEndpoint `json:"endpoints"`
@@ -55,7 +60,8 @@ func (s *CloudProjectDatabaseResponse) String() string {
 
 func (v CloudProjectDatabaseResponse) ToMap() map[string]interface{} {
 	obj := make(map[string]interface{})
-	obj["backup_time"] = v.BackupTime
+	obj["backup_regions"] = v.Backups.Regions
+	obj["backup_time"] = v.Backups.Time
 	obj["created_at"] = v.CreatedAt
 	obj["description"] = v.Description
 	obj["id"] = v.Id
@@ -151,6 +157,7 @@ type CloudProjectDatabaseCreateOpts struct {
 	Plan         string                           `json:"plan"`
 	SubnetId     string                           `json:"subnetId,omitempty"`
 	Version      string                           `json:"version"`
+	Backups      CloudProjectDatabaseBackups      `json:"backups,omitempty"`
 }
 
 type CloudProjectDatabaseDisk struct {
@@ -193,17 +200,28 @@ func (opts *CloudProjectDatabaseCreateOpts) FromResource(d *schema.ResourceData)
 	opts.SubnetId = nodes[0].SubnetId
 	opts.Version = d.Get("version").(string)
 	opts.Disk = CloudProjectDatabaseDisk{Size: d.Get("disk_size").(int)}
+
+	regions, err := helpers.StringsFromSchema(d, "backup_regions")
+	if err != nil {
+		return err, nil
+	}
+
+	opts.Backups = CloudProjectDatabaseBackups{
+		Regions: regions,
+		Time:    d.Get("backup_time").(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"`
-	Disk        CloudProjectDatabaseDisk `json:"disk,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"`
+	Backups     CloudProjectDatabaseBackups `json:"backups,omitempty"`
 }
 
 func (opts *CloudProjectDatabaseUpdateOpts) FromResource(d *schema.ResourceData) (error, *CloudProjectDatabaseUpdateOpts) {
@@ -220,6 +238,17 @@ func (opts *CloudProjectDatabaseUpdateOpts) FromResource(d *schema.ResourceData)
 	opts.Flavor = d.Get("flavor").(string)
 	opts.Version = d.Get("version").(string)
 	opts.Disk = CloudProjectDatabaseDisk{Size: d.Get("disk_size").(int)}
+
+	regions, err := helpers.StringsFromSchema(d, "backup_regions")
+	if err != nil {
+		return err, nil
+	}
+
+	opts.Backups = CloudProjectDatabaseBackups{
+		Regions: regions,
+		Time:    d.Get("backup_time").(string),
+	}
+
 	return nil, opts
 }
 

website/docs/d/cloud_project_database.html.markdown

@@ -41,6 +41,7 @@ The following attributes are exported:
 
 * `id` - See Argument Reference above.
 * `service_name` - See Argument Reference above.
+* `backup_regions` - List of region where backups are pushed.
 * `backup_time` - Time on which backups start every day.
 * `created_at` - Date of the creation of the cluster.
 * `description` - Small description of the database service.

website/docs/r/cloud_project_database.html.markdown

@@ -231,13 +231,18 @@ The following arguments are supported:
 
 * `version` - (Required) The version of the engine in which the service should be deployed
 
+* `backup_regions` - List of region where backups are pushed. Not more than 1 regions for MongoDB. Not more than 2 regions for the other engines with one being the same as the nodes[].region field
+
+* `backup_time` - Time on which backups start every day.
+
 ## Attributes Reference
 
 The following attributes are exported:
 
 * `id` - Public Cloud Database Service ID
 * `service_name` - See Argument Reference above.
-* `backup_time` - Time on which backups start every day.
+* `backup_regions` - See Argument Reference above.
+* `backup_time` - See Argument Reference above.
 * `created_at` - Date of the creation of the cluster.
 * `description` - See Argument Reference above.
 * `endpoints` - List of all endpoints objects of the service.