feat(rdb): add support for project in rdb instance (#605)

scaleway · Oct 7, 2020 · 2f4bbab · 2f4bbab
1 parent 7240c1e
commit 2f4bbab
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/docs/resources/rdb_instance_beta.md b/docs/resources/rdb_instance_beta.md
@@ -58,6 +58,8 @@ The following arguments are supported:
 
 - `organization_id` - (Defaults to [provider](../index.md#organization_id) `organization_id`) The ID of the organization the Database Instance is associated with.
 
+- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the Database Instance is associated with.
+
 
 ## Attributes Reference
 

diff --git a/scaleway/helpers.go b/scaleway/helpers.go
@@ -227,6 +227,18 @@ func organizationIDSchema() *schema.Schema {
 	}
 }
 
+// projectIDSchema returns a standard schema for a project_id
+func projectIDSchema() *schema.Schema {
+	return &schema.Schema{
+		Type:         schema.TypeString,
+		Description:  "The project_id you want to attach the resource to",
+		Optional:     true,
+		ForceNew:     true,
+		Computed:     true,
+		ValidateFunc: validationUUID(),
+	}
+}
+
 // zoneSchema returns a standard schema for a zone
 func zoneSchema() *schema.Schema {
 	return &schema.Schema{

diff --git a/scaleway/resource_rdb_instance_beta.go b/scaleway/resource_rdb_instance_beta.go
@@ -114,6 +114,7 @@ func resourceScalewayRdbInstanceBeta() *schema.Resource {
 			// Common
 			"region":          regionSchema(),
 			"organization_id": organizationIDSchema(),
+			"project_id":      projectIDSchema(),
 		},
 	}
 }
@@ -127,6 +128,7 @@ func resourceScalewayRdbInstanceBetaCreate(d *schema.ResourceData, m interface{}
 	createReq := &rdb.CreateInstanceRequest{
 		Region:         region,
 		OrganizationID: expandStringPtr(d.Get("organization_id")),
+		ProjectID:      expandStringPtr(d.Get("project_id")),
 		Name:           expandOrGenerateString(d.Get("name"), "rdb"),
 		NodeType:       d.Get("node_type").(string),
 		Engine:         d.Get("engine").(string),
@@ -192,6 +194,7 @@ func resourceScalewayRdbInstanceBetaRead(d *schema.ResourceData, m interface{})
 	_ = d.Set("read_replicas", flattenRdbInstanceReadReplicas(res.ReadReplicas))
 	_ = d.Set("region", string(region))
 	_ = d.Set("organization_id", res.OrganizationID)
+	_ = d.Set("project_id", res.ProjectID)
 
 	// set certificate
 	cert, err := rdbAPI.GetInstanceCertificate(&rdb.GetInstanceCertificateRequest{