Skip to content

Commit c2dfc61

Browse files
committed
feat(rdb): read replica: fill empty values in import generation
1 parent c7d4c41 commit c2dfc61

10 files changed

+1567
-1762
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/nats-io/jwt/v2 v2.5.3
1717
github.com/nats-io/nats.go v1.31.0
1818
github.com/robfig/cron/v3 v3.0.1
19-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22
19+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22.0.20240109155607-70eec6dc9637
2020
github.com/stretchr/testify v1.8.4
2121
)
2222

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
186186
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
187187
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
188188
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
189-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22 h1:wJrcTdddKOI8TFxs8cemnhKP2EmKy3yfUKHj3ZdfzYo=
190-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
189+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22.0.20240109155607-70eec6dc9637 h1:F/EUOngL9fqQsi3JHn8S6n8oJasOCFk5J/76D+n3s2g=
190+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.22.0.20240109155607-70eec6dc9637/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
191191
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
192192
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
193193
github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ=

scaleway/resource_rdb_read_replica.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ func resourceScalewayRdbReadReplica() *schema.Resource {
3131
SchemaVersion: 0,
3232
Schema: map[string]*schema.Schema{
3333
"instance_id": {
34-
Type: schema.TypeString,
35-
Required: true,
36-
Description: "Id of the rdb instance to replicate",
34+
Type: schema.TypeString,
35+
Required: true,
36+
Description: "Id of the rdb instance to replicate",
37+
DiffSuppressFunc: diffSuppressFuncLocality,
3738
},
3839
"same_zone": {
3940
Type: schema.TypeBool,
@@ -197,8 +198,10 @@ func resourceScalewayRdbReadReplicaRead(ctx context.Context, d *schema.ResourceD
197198
_ = d.Set("direct_access", directAccess)
198199
_ = d.Set("private_network", privateNetwork)
199200

201+
regionStr := region.String()
200202
_ = d.Set("same_zone", rr.SameZone)
201-
_ = d.Set("region", string(region))
203+
_ = d.Set("region", regionStr)
204+
_ = d.Set("instance_id", regionStr+"/"+rr.InstanceID)
202205

203206
return nil
204207
}

scaleway/testdata/data-source-lb-ips-basic.cassette.yaml

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

scaleway/testdata/data-source-lbip-basic.cassette.yaml

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

scaleway/testdata/rdb-read-replica-basic.cassette.yaml

Lines changed: 232 additions & 166 deletions
Large diffs are not rendered by default.

scaleway/testdata/rdb-read-replica-different-zone.cassette.yaml

Lines changed: 446 additions & 380 deletions
Large diffs are not rendered by default.

scaleway/testdata/rdb-read-replica-multiple-endpoints.cassette.yaml

Lines changed: 184 additions & 283 deletions
Large diffs are not rendered by default.

scaleway/testdata/rdb-read-replica-private-network.cassette.yaml

Lines changed: 181 additions & 247 deletions
Large diffs are not rendered by default.

scaleway/testdata/rdb-read-replica-update.cassette.yaml

Lines changed: 274 additions & 439 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)