Skip to content

Commit 66a6940

Browse files
authored
fix(rdb): support sbs_15k on update (#2599)
* fix(rdb): support sbs_15k on update * update cassette
1 parent 3451ac3 commit 66a6940

File tree

4 files changed

+1726
-310
lines changed

4 files changed

+1726
-310
lines changed

docs/resources/rdb_instance.md

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,30 @@ For more information, see [the documentation](https://www.scaleway.com/en/develo
1616
resource "scaleway_rdb_instance" "main" {
1717
name = "test-rdb"
1818
node_type = "DB-DEV-S"
19-
engine = "PostgreSQL-11"
19+
engine = "PostgreSQL-15"
2020
is_ha_cluster = true
2121
disable_backup = true
2222
user_name = "my_initial_user"
2323
password = "thiZ_is_v&ry_s3cret"
2424
}
2525
```
2626

27+
### Example Block Storage Low Latency
28+
29+
```terraform
30+
resource "scaleway_rdb_instance" "main" {
31+
name = "test-rdb-sbs"
32+
node_type = "db-play2-pico"
33+
engine = "PostgreSQL-15"
34+
is_ha_cluster = true
35+
disable_backup = true
36+
user_name = "my_initial_user"
37+
password = "thiZ_is_v&ry_s3cret"
38+
volume_type = "sbs_15k"
39+
volume_size_in_gb = 10
40+
}
41+
```
42+
2743
### Example with Settings
2844

2945
```terraform
@@ -49,7 +65,7 @@ resource "scaleway_rdb_instance" "main" {
4965
resource "scaleway_rdb_instance" "main" {
5066
name = "test-rdb"
5167
node_type = "DB-DEV-S"
52-
engine = "PostgreSQL-11"
68+
engine = "PostgreSQL-15"
5369
is_ha_cluster = true
5470
user_name = "my_initial_user"
5571
password = "thiZ_is_v&ry_s3cret"
@@ -75,7 +91,7 @@ resource "scaleway_vpc_private_network" "pn" {
7591
7692
resource "scaleway_rdb_instance" "main" {
7793
node_type = "db-dev-s"
78-
engine = "PostgreSQL-11"
94+
engine = "PostgreSQL-15"
7995
private_network {
8096
pn_id = scaleway_vpc_private_network.pn.id
8197
ip_net = "172.16.20.4/22" # IP address within a given IP network
@@ -91,7 +107,7 @@ resource "scaleway_vpc_private_network" "pn" {}
91107
92108
resource "scaleway_rdb_instance" "main" {
93109
node_type = "DB-DEV-S"
94-
engine = "PostgreSQL-11"
110+
engine = "PostgreSQL-15"
95111
private_network {
96112
pn_id = scaleway_vpc_private_network.pn.id
97113
enable_ipam = true
@@ -105,7 +121,7 @@ resource "scaleway_rdb_instance" "main" {
105121
```terraform
106122
resource "scaleway_rdb_instance" "main" {
107123
node_type = "db-dev-s"
108-
engine = "PostgreSQL-11"
124+
engine = "PostgreSQL-15"
109125
}
110126
```
111127

internal/services/rdb/instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ func ResourceRdbInstanceUpdate(ctx context.Context, d *schema.ResourceData, m in
546546
// Volume type and size
547547
if d.HasChanges("volume_type", "volume_size_in_gb") {
548548
switch volType {
549-
case rdb.VolumeTypeBssd, rdb.VolumeTypeSbs5k:
549+
case rdb.VolumeTypeBssd, rdb.VolumeTypeSbs5k, rdb.VolumeTypeSbs15k:
550550
if d.HasChange("volume_type") {
551551
upgradeInstanceRequests = append(upgradeInstanceRequests,
552552
rdb.UpgradeInstanceRequest{

internal/services/rdb/instance_test.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -968,6 +968,28 @@ func TestAccInstance_SBSVolume(t *testing.T) {
968968
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "volume_size_in_gb", "20"),
969969
),
970970
},
971+
{
972+
Config: fmt.Sprintf(`
973+
resource scaleway_rdb_instance main {
974+
name = "test-rdb-instance-volume"
975+
node_type = "db-play2-pico"
976+
engine = %q
977+
is_ha_cluster = false
978+
disable_backup = true
979+
user_name = "my_initial_user"
980+
password = "thiZ_is_v&ry_s3cret"
981+
region= "nl-ams"
982+
tags = [ "terraform-test", "scaleway_rdb_instance", "volume" ]
983+
volume_type = "sbs_15k"
984+
volume_size_in_gb = 20
985+
}
986+
`, latestEngineVersion),
987+
Check: resource.ComposeTestCheckFunc(
988+
isInstancePresent(tt, "scaleway_rdb_instance.main"),
989+
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "volume_type", "sbs_15k"),
990+
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "volume_size_in_gb", "20"),
991+
),
992+
},
971993
},
972994
})
973995
}

internal/services/rdb/testdata/instance-sbs-volume.cassette.yaml

Lines changed: 1682 additions & 304 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)