Skip to content

Commit 84d4a79

Browse files
authored
fix(documentdb): naming and test cases (#2154)
* docs * chore: update cassettes * fix(documentdb): add dependency on test
1 parent dc0493d commit 84d4a79

22 files changed

+1548
-1448
lines changed

docs/data-sources/documentdb_database.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
22
subcategory: "Databases"
33
layout: "scaleway"
4-
page_title: "Scaleway: scaleway_document_db_database"
4+
page_title: "Scaleway: scaleway_documentdb_database"
55
---
66

7-
# scaleway_document_db_database
7+
# scaleway_documentdb_database
88

99
Gets information about DocumentDB database. More on our official [site](https://www.scaleway.com/en/developers/api/document_db/)
1010

1111
## Example Usage
1212

1313
```hcl
1414
# Get the database foobar hosted on instance id 11111111-1111-1111-1111-111111111111
15-
data scaleway_document_db_database main {
15+
data scaleway_documentdb_database main {
1616
instance_id = "11111111-1111-1111-1111-111111111111"
1717
name = "foobar"
1818
}

docs/data-sources/documentdb_instance.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
---
22
subcategory: "Databases"
33
layout: "scaleway"
4-
page_title: "Scaleway: scaleway_document_db_instance"
4+
page_title: "Scaleway: scaleway_documentdb_instance"
55
---
66

7-
# scaleway_document_db_instance
7+
# scaleway_documentdb_instance
88

99
Gets information about an DocumentDB instance. For further information see our [developers website](https://www.scaleway.com/en/developers/api/document_db/)
1010

1111
## Example Usage
1212

1313
```hcl
1414
# Get info by name
15-
data "scaleway_document_db_instance" "db" {
15+
data "scaleway_documentdb_instance" "db" {
1616
name = "foobar"
1717
}
1818
1919
# Get info by instance ID
20-
data "scaleway_document_db_instance" "db" {
20+
data "scaleway_documentdb_instance" "db" {
2121
instance_id = "11111111-1111-1111-1111-111111111111"
2222
}
2323
```
@@ -42,4 +42,4 @@ In addition to all above arguments, the following attributes are exported:
4242

4343
~> **Important:** DocumentDB instances' IDs are [regional](../guides/regions_and_zones.md#resource-ids), which means they are of the form `{region}/{id}`, e.g. `fr-par/11111111-1111-1111-1111-111111111111`
4444

45-
Exported attributes are the ones from `scaleway_document_db_instance` [resource](../resources/documentdb_instance.md)
45+
Exported attributes are the ones from `scaleway_documentdb_instance` [resource](../resources/documentdb_instance.md)

docs/resources/documentdb_database.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
subcategory: "Databases"
3-
page_title: "Scaleway: scaleway_document_db_database"
3+
page_title: "Scaleway: scaleway_documentdb_database"
44
---
55

6-
# scaleway_document_db_database
6+
# scaleway_documentdb_database
77

88
Creates and manages Scaleway DocumentDB database.
99
For more information, see [the documentation](https://developers.scaleway.com/en/products/rdb/api).
@@ -13,7 +13,7 @@ For more information, see [the documentation](https://developers.scaleway.com/en
1313
### Basic
1414

1515
```hcl
16-
resource "scaleway_document_db_database" "main" {
16+
resource "scaleway_documentdb_database" "main" {
1717
instance_id = "11111111-1111-1111-1111-111111111111"
1818
name = "my-new-database"
1919
}
@@ -45,5 +45,5 @@ In addition to all arguments above, the following attributes are exported:
4545
DocumentDB Database can be imported using the `{region}/{id}/{DBNAME}`, e.g.
4646

4747
```bash
48-
$ terraform import scaleway_document_db_database.mydb fr-par/11111111-1111-1111-1111-111111111111/mydb
48+
$ terraform import scaleway_documentdb_database.mydb fr-par/11111111-1111-1111-1111-111111111111/mydb
4949
```

docs/resources/documentdb_private_network_endpoint.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
subcategory: "Databases"
3-
page_title: "Scaleway: scaleway_document_db_private_network_endpoint"
3+
page_title: "Scaleway: scaleway_documentdb_private_network_endpoint"
44
---
55

6-
# scaleway_document_db_private_network_endpoint
6+
# scaleway_documentdb_private_network_endpoint
77

88
Creates and manages Scaleway Database Private Network Endpoint.
99
For more information, see [the documentation](https://www.scaleway.com/en/developers/api/document_db/).
@@ -17,7 +17,7 @@ resource "scaleway_vpc_private_network" "pn" {
1717
name = "my_private_network"
1818
}
1919
20-
resource "scaleway_document_db_private_network_endpoint" "main" {
20+
resource "scaleway_documentdb_private_network_endpoint" "main" {
2121
instance_id = "11111111-1111-1111-1111-111111111111"
2222
private_network {
2323
ip_net = "172.16.32.3/22"
@@ -65,5 +65,5 @@ are of the form `{region}/{id}`, e.g. `fr-par/11111111-1111-1111-1111-1111111111
6565
Database Instance Endpoint can be imported using the `{region}/{endpoint_id}`, e.g.
6666

6767
```bash
68-
$ terraform import scaleway_document_db_private_network_endpoint.end fr-par/11111111-1111-1111-1111-111111111111
68+
$ terraform import scaleway_documentdb_private_network_endpoint.end fr-par/11111111-1111-1111-1111-111111111111
6969
```

docs/resources/documentdb_privilege.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
22
subcategory: "Databases"
3-
page_title: "Scaleway: scaleway_document_db_privilege"
3+
page_title: "Scaleway: scaleway_documentdb_privilege"
44
---
55

6-
# scaleway_document_db_privilege
6+
# scaleway_documentdb_privilege
77

88
Create and manage Scaleway DocumentDB database privilege.
99
For more information, see [the documentation](https://www.scaleway.com/en/developers/api/document_db/).
1010

1111
## Example usage
1212

1313
```hcl
14-
resource "scaleway_document_db_privilege" "main" {
14+
resource "scaleway_documentdb_privilege" "main" {
1515
instance_id = "11111111-1111-1111-1111-111111111111"
1616
user_name = "my-db-user"
1717
database_name = "my-db-name"
@@ -45,5 +45,5 @@ In addition to all arguments above, the following attributes are exported:
4545
The user privileges can be imported using the `{region}/{instance_id}/{database_name}/{user_name}`, e.g.
4646

4747
```bash
48-
$ terraform import scaleway_document_db_privilege.o fr-par/11111111-1111-1111-1111-111111111111/database_name/foo
48+
$ terraform import scaleway_documentdb_privilege.o fr-par/11111111-1111-1111-1111-111111111111/database_name/foo
4949
```

docs/resources/documentdb_read_replica.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
subcategory: "Databases"
3-
page_title: "Scaleway: scaleway_document_db_read_replica"
3+
page_title: "Scaleway: scaleway_documentdb_read_replica"
44
---
55

6-
# scaleway_document_db_read_replica
6+
# scaleway_documentdb_read_replica
77

88
Creates and manages Scaleway DocumentDB Database read replicas.
99
For more information, see [the documentation](https://www.scaleway.com/en/developers/api/document_db/).
@@ -13,7 +13,7 @@ For more information, see [the documentation](https://www.scaleway.com/en/develo
1313
### Basic
1414

1515
```hcl
16-
resource scaleway_document_db_read_replica "replica" {
16+
resource scaleway_documentdb_read_replica "replica" {
1717
instance_id = "11111111-1111-1111-1111-111111111111"
1818
direct_access {}
1919
}
@@ -24,7 +24,7 @@ resource scaleway_document_db_read_replica "replica" {
2424
```hcl
2525
resource "scaleway_vpc_private_network" "pn" {}
2626
27-
resource "scaleway_document_db_read_replica" "replica" {
27+
resource "scaleway_documentdb_read_replica" "replica" {
2828
instance_id = scaleway_rdb_instance.instance.id
2929
private_network {
3030
private_network_id = scaleway_vpc_private_network.pn.id
@@ -80,5 +80,5 @@ they are of the form `{region}/{id}`, e.g. `fr-par/11111111-1111-1111-1111-11111
8080
Database Read replica can be imported using the `{region}/{id}`, e.g.
8181

8282
```bash
83-
$ terraform import scaleway_document_db_read_replica.rr fr-par/11111111-1111-1111-1111-111111111111
83+
$ terraform import scaleway_documentdb_read_replica.rr fr-par/11111111-1111-1111-1111-111111111111
8484
```

docs/resources/documentdb_user.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
subcategory: "Databases"
3-
page_title: "Scaleway: scaleway_document_db_user"
3+
page_title: "Scaleway: scaleway_documentdb_user"
44
---
55

6-
# scaleway_document_db_user
6+
# scaleway_documentdb_user
77

88
Creates and manages Scaleway Database DocumentDB Users.
99
For more information, see [the documentation](https://www.scaleway.com/en/developers/api/document_db/).
@@ -18,7 +18,7 @@ resource "random_password" "db_password" {
1818
special = true
1919
}
2020
21-
resource "scaleway_document_db_user" "db_admin" {
21+
resource "scaleway_documentdb_user" "db_admin" {
2222
instance_id = "11111111-1111-1111-1111-111111111111"
2323
name = "devtools"
2424
password = random_password.db_password.result
@@ -55,5 +55,5 @@ In addition to all arguments above, the following attributes are exported:
5555
Database User can be imported using `{region}/{instance_id}/{user_name}`, e.g.
5656

5757
```bash
58-
$ terraform import scaleway_document_db_user.admin fr-par/11111111-1111-1111-1111-111111111111/admin
58+
$ terraform import scaleway_documentdb_user.admin fr-par/11111111-1111-1111-1111-111111111111/admin
5959
```

scaleway/data_source_document_db_database_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccScalewayDataSourceDocumentDBDatabase_Basic(t *testing.T) {
1818
Steps: []resource.TestStep{
1919
{
2020
Config: `
21-
resource scaleway_document_db_instance main {
21+
resource scaleway_documentdb_instance main {
2222
name = "test-ds-document_db-database-basic"
2323
node_type = "docdb-play2-pico"
2424
engine = "FerretDB-1"
@@ -27,20 +27,20 @@ func TestAccScalewayDataSourceDocumentDBDatabase_Basic(t *testing.T) {
2727
volume_size_in_gb = 20
2828
}
2929
30-
resource scaleway_document_db_database main {
31-
instance_id = scaleway_document_db_instance.main.id
30+
resource scaleway_documentdb_database main {
31+
instance_id = scaleway_documentdb_instance.main.id
3232
name = "test-ds-document_db-database-basic"
3333
}
3434
35-
data scaleway_document_db_database main {
36-
instance_id = scaleway_document_db_instance.main.id
37-
name = scaleway_document_db_database.main.name
35+
data scaleway_documentdb_database main {
36+
instance_id = scaleway_documentdb_instance.main.id
37+
name = scaleway_documentdb_database.main.name
3838
}
3939
`,
4040
Check: resource.ComposeTestCheckFunc(
41-
testAccCheckScalewayDocumentDBDatabaseExists(tt, "scaleway_document_db_database.main"),
41+
testAccCheckScalewayDocumentDBDatabaseExists(tt, "scaleway_documentdb_database.main"),
4242

43-
resource.TestCheckResourceAttrPair("scaleway_document_db_database.main", "id", "data.scaleway_document_db_database.main", "id"),
43+
resource.TestCheckResourceAttrPair("scaleway_documentdb_database.main", "id", "data.scaleway_documentdb_database.main", "id"),
4444
),
4545
},
4646
},

scaleway/data_source_document_db_instance_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestAccScalewayDataSourceDocumentDBInstance_Basic(t *testing.T) {
1818
Steps: []resource.TestStep{
1919
{
2020
Config: `
21-
resource scaleway_document_db_instance main {
21+
resource scaleway_documentdb_instance main {
2222
name = "test-ds-document_db-instance-basic"
2323
node_type = "docdb-play2-pico"
2424
engine = "FerretDB-1"
@@ -27,21 +27,21 @@ func TestAccScalewayDataSourceDocumentDBInstance_Basic(t *testing.T) {
2727
volume_size_in_gb = 20
2828
}
2929
30-
data scaleway_document_db_instance find_by_name {
31-
name = scaleway_document_db_instance.main.name
30+
data scaleway_documentdb_instance find_by_name {
31+
name = scaleway_documentdb_instance.main.name
3232
}
3333
34-
data scaleway_document_db_instance find_by_id {
35-
instance_id = scaleway_document_db_instance.main.id
34+
data scaleway_documentdb_instance find_by_id {
35+
instance_id = scaleway_documentdb_instance.main.id
3636
}
3737
`,
3838
Check: resource.ComposeTestCheckFunc(
39-
testAccCheckScalewayDocumentDBInstanceExists(tt, "scaleway_document_db_instance.main"),
39+
testAccCheckScalewayDocumentDBInstanceExists(tt, "scaleway_documentdb_instance.main"),
4040

41-
resource.TestCheckResourceAttrPair("scaleway_document_db_instance.main", "name", "data.scaleway_document_db_instance.find_by_name", "name"),
42-
resource.TestCheckResourceAttrPair("scaleway_document_db_instance.main", "name", "data.scaleway_document_db_instance.find_by_id", "name"),
43-
resource.TestCheckResourceAttrPair("scaleway_document_db_instance.main", "id", "data.scaleway_document_db_instance.find_by_name", "id"),
44-
resource.TestCheckResourceAttrPair("scaleway_document_db_instance.main", "id", "data.scaleway_document_db_instance.find_by_id", "id"),
41+
resource.TestCheckResourceAttrPair("scaleway_documentdb_instance.main", "name", "data.scaleway_documentdb_instance.find_by_name", "name"),
42+
resource.TestCheckResourceAttrPair("scaleway_documentdb_instance.main", "name", "data.scaleway_documentdb_instance.find_by_id", "name"),
43+
resource.TestCheckResourceAttrPair("scaleway_documentdb_instance.main", "id", "data.scaleway_documentdb_instance.find_by_name", "id"),
44+
resource.TestCheckResourceAttrPair("scaleway_documentdb_instance.main", "id", "data.scaleway_documentdb_instance.find_by_id", "id"),
4545
),
4646
},
4747
},

scaleway/data_source_document_db_load_balancer_endpoint_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,28 @@ func TestAccScalewayDataSourceDocumentDBInstanceLoadBalancer_Basic(t *testing.T)
1818
Steps: []resource.TestStep{
1919
{
2020
Config: `
21-
resource "scaleway_document_db_instance" "main" {
22-
name = "test-ds-document_db-instance-basic"
21+
resource "scaleway_documentdb_instance" "main" {
22+
name = "test-ds-document_db-instance-basic-load-balancer"
2323
node_type = "docdb-play2-pico"
2424
engine = "FerretDB-1"
2525
user_name = "my_initial_user"
2626
password = "thiZ_is_v&ry_s3cret"
2727
volume_size_in_gb = 20
2828
}
2929
30-
data "scaleway_document_db_load_balancer_endpoint" "find_by_name" {
31-
instance_name = scaleway_document_db_instance.main.name
30+
data "scaleway_documentdb_load_balancer_endpoint" "find_by_name" {
31+
instance_name = scaleway_documentdb_instance.main.name
3232
}
3333
34-
data "scaleway_document_db_load_balancer_endpoint" "find_by_id" {
35-
instance_id = scaleway_document_db_instance.main.id
34+
data "scaleway_documentdb_load_balancer_endpoint" "find_by_id" {
35+
instance_id = scaleway_documentdb_instance.main.id
3636
}
3737
`,
3838
Check: resource.ComposeTestCheckFunc(
39-
testAccCheckScalewayDocumentDBInstanceEndpointExists(tt, "data.scaleway_document_db_load_balancer_endpoint.find_by_name"),
40-
testAccCheckScalewayDocumentDBInstanceEndpointExists(tt, "data.scaleway_document_db_load_balancer_endpoint.find_by_id"),
41-
resource.TestCheckResourceAttrPair("scaleway_document_db_instance.main", "name", "data.scaleway_document_db_load_balancer_endpoint.find_by_name", "instance_name"),
42-
resource.TestCheckResourceAttrPair("scaleway_document_db_instance.main", "name", "data.scaleway_document_db_load_balancer_endpoint.find_by_id", "instance_name"),
39+
testAccCheckScalewayDocumentDBInstanceEndpointExists(tt, "data.scaleway_documentdb_load_balancer_endpoint.find_by_name"),
40+
testAccCheckScalewayDocumentDBInstanceEndpointExists(tt, "data.scaleway_documentdb_load_balancer_endpoint.find_by_id"),
41+
resource.TestCheckResourceAttrPair("scaleway_documentdb_instance.main", "name", "data.scaleway_documentdb_load_balancer_endpoint.find_by_name", "instance_name"),
42+
resource.TestCheckResourceAttrPair("scaleway_documentdb_instance.main", "name", "data.scaleway_documentdb_load_balancer_endpoint.find_by_id", "instance_name"),
4343
),
4444
},
4545
},

0 commit comments

Comments
 (0)