Skip to content

Commit edc21fc

Browse files
committed
feat(rdb): update cassette and fix test
1 parent bd70e73 commit edc21fc

File tree

41 files changed

+101417
-71903
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+101417
-71903
lines changed

internal/services/rdb/helpers.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ func expandInstanceLogsPolicy(i interface{}) *rdb.LogsPolicy {
173173
TotalDiskRetention: expandSizePtr(policy["total_disk_retention"]),
174174
}
175175
}
176-
177176
return nil
178177
}
179178

internal/services/rdb/instance.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ func ResourceInstance() *schema.Resource {
285285
"logs_policy": {
286286
Type: schema.TypeList,
287287
Optional: true,
288+
Computed: true,
288289
Description: "Logs policy configuration",
289290
MaxItems: 1,
290291
Elem: &schema.Resource{
@@ -293,11 +294,13 @@ func ResourceInstance() *schema.Resource {
293294
"max_age_retention": {
294295
Type: schema.TypeInt,
295296
Optional: true,
297+
Computed: true,
296298
Description: "The max age (in days) of remote logs to keep on the Database Instance",
297299
},
298300
"total_disk_retention": {
299301
Type: schema.TypeInt,
300302
Optional: true,
303+
Computed: true,
301304
Description: "The max disk size of remote logs to keep on the Database Instance.",
302305
},
303306
},
@@ -378,7 +381,6 @@ func ResourceRdbInstanceCreate(ctx context.Context, d *schema.ResourceData, m in
378381
// Configure Schedule Backup
379382
// BackupScheduleFrequency and BackupScheduleRetention can only configure after instance creation
380383
if !d.Get("disable_backup").(bool) {
381-
382384
updateReq.BackupSameRegion = types.ExpandBoolPtr(d.Get("backup_same_region"))
383385
updateReq.IsBackupScheduleDisabled = scw.BoolPtr(d.Get("disable_backup").(bool))
384386
if backupScheduleFrequency, okFrequency := d.GetOk("backup_schedule_frequency"); okFrequency {
@@ -683,7 +685,10 @@ func ResourceRdbInstanceUpdate(ctx context.Context, d *schema.ResourceData, m in
683685
}
684686

685687
if d.HasChange("logs_policy") {
686-
req.LogsPolicy = expandInstanceLogsPolicy(d.Get("logs_policy"))
688+
policyRaw, exist := d.GetOk("logs_policy")
689+
if exist {
690+
req.LogsPolicy = expandInstanceLogsPolicy(policyRaw)
691+
}
687692
}
688693

689694
_, err = waitForRDBInstance(ctx, rdbAPI, region, ID, d.Timeout(schema.TimeoutUpdate))

internal/services/rdb/instance_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ func TestAccInstance_WithCluster(t *testing.T) {
144144
func TestAccInstance_LogsPolicy(t *testing.T) {
145145
tt := acctest.NewTestTools(t)
146146
defer tt.Cleanup()
147-
latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName)
148147

148+
latestEngineVersion := rdbchecks.GetLatestEngineVersion(tt, postgreSQLEngineName)
149149
resource.ParallelTest(t, resource.TestCase{
150150
PreCheck: func() { acctest.PreCheck(t) },
151151
ProviderFactories: tt.ProviderFactories,
@@ -186,14 +186,14 @@ func TestAccInstance_LogsPolicy(t *testing.T) {
186186
password = "thiZ_is_v&ry_s8cret"
187187
tags = [ "terraform-test", "scaleway_rdb_instance", "minimal" ]
188188
logs_policy {
189-
max_age_retention = 30
190-
total_disk_retention = 100000000
189+
max_age_retention = 10
190+
total_disk_retention = 200000000
191191
}
192192
}
193193
`, latestEngineVersion),
194194
Check: resource.ComposeTestCheckFunc(
195195
isInstancePresent(tt, "scaleway_rdb_instance.main"),
196-
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "logs_policy.0.max_age_retention", "30"),
196+
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "logs_policy.0.max_age_retention", "10"),
197197
resource.TestCheckResourceAttr("scaleway_rdb_instance.main", "logs_policy.0.total_disk_retention", "200000000"),
198198
),
199199
},

internal/services/rdb/testdata/acl-basic.cassette.yaml

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

internal/services/rdb/testdata/data-source-acl-basic.cassette.yaml

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

internal/services/rdb/testdata/data-source-database-backup-basic.cassette.yaml

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

internal/services/rdb/testdata/data-source-database-basic.cassette.yaml

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

internal/services/rdb/testdata/data-source-instance-basic.cassette.yaml

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

internal/services/rdb/testdata/data-source-privilege-basic.cassette.yaml

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

internal/services/rdb/testdata/database-backup-basic.cassette.yaml

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

internal/services/rdb/testdata/database-basic.cassette.yaml

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

internal/services/rdb/testdata/database-manual-delete.cassette.yaml

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

internal/services/rdb/testdata/instance-backup-schedule.cassette.yaml

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

internal/services/rdb/testdata/instance-basic.cassette.yaml

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

internal/services/rdb/testdata/instance-capitalize.cassette.yaml

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

internal/services/rdb/testdata/instance-change-volume-type.cassette.yaml

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

internal/services/rdb/testdata/instance-endpoints.cassette.yaml

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

internal/services/rdb/testdata/instance-init-settings.cassette.yaml

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

internal/services/rdb/testdata/instance-logs-policy.cassette.yaml

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

internal/services/rdb/testdata/instance-private-network-dhcp.cassette.yaml

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

internal/services/rdb/testdata/instance-private-network-update.cassette.yaml

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

internal/services/rdb/testdata/instance-private-network.cassette.yaml

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

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

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

internal/services/rdb/testdata/instance-settings.cassette.yaml

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

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

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

internal/services/rdb/testdata/instance-with-cluster.cassette.yaml

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

internal/services/rdb/testdata/privilege-basic.cassette.yaml

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

internal/services/rdb/testdata/read-replica-basic.cassette.yaml

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

internal/services/rdb/testdata/read-replica-different-zone.cassette.yaml

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

internal/services/rdb/testdata/read-replica-multiple-endpoints.cassette.yaml

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

internal/services/rdb/testdata/read-replica-private-network.cassette.yaml

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

internal/services/rdb/testdata/read-replica-update.cassette.yaml

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

internal/services/rdb/testdata/read-replica-with-instance-also-in-private-network.cassette.yaml

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

internal/services/rdb/testdata/user-basic.cassette.yaml

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

0 commit comments

Comments
 (0)