Skip to content

Commit dd1c481

Browse files
authored
fix(rdb): fill empty values in import generation (#2307)
* fix(rdb): fill empty values in import generation * test(domain): re-record cassettes
1 parent c0b176b commit dd1c481

11 files changed

+4526
-2791
lines changed

scaleway/resource_rdb_instance.go

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ func resourceScalewayRdbInstance() *schema.Resource {
8282
Type: schema.TypeString,
8383
ForceNew: true,
8484
Optional: true,
85+
Computed: true,
8586
Description: "Identifier for the first user of the database instance",
8687
},
8788
"password": {
@@ -423,11 +424,7 @@ func resourceScalewayRdbInstanceRead(ctx context.Context, d *schema.ResourceData
423424
_ = d.Set("backup_schedule_frequency", int(res.BackupSchedule.Frequency))
424425
_ = d.Set("backup_schedule_retention", int(res.BackupSchedule.Retention))
425426
_ = d.Set("backup_same_region", res.BackupSameRegion)
426-
_ = d.Set("user_name", d.Get("user_name").(string)) // user name and
427-
_ = d.Set("password", d.Get("password").(string)) // password are immutable
428-
if len(res.Tags) > 0 {
429-
_ = d.Set("tags", flattenSliceString(res.Tags))
430-
}
427+
_ = d.Set("tags", flattenSliceString(res.Tags))
431428
if res.Endpoint != nil {
432429
_ = d.Set("endpoint_ip", flattenIPPtr(res.Endpoint.IP))
433430
_ = d.Set("endpoint_port", int(res.Endpoint.Port))
@@ -444,6 +441,26 @@ func resourceScalewayRdbInstanceRead(ctx context.Context, d *schema.ResourceData
444441
_ = d.Set("organization_id", res.OrganizationID)
445442
_ = d.Set("project_id", res.ProjectID)
446443

444+
// set user and password
445+
if user, ok := d.GetOk("user_name"); ok {
446+
_ = d.Set("user_name", user.(string))
447+
} else {
448+
users, err := rdbAPI.ListUsers(&rdb.ListUsersRequest{
449+
Region: region,
450+
InstanceID: res.ID,
451+
}, scw.WithContext(ctx), scw.WithAllPages())
452+
if err != nil {
453+
return diag.FromErr(err)
454+
}
455+
for _, u := range users.Users {
456+
if u.IsAdmin {
457+
_ = d.Set("user_name", u.Name)
458+
break
459+
}
460+
}
461+
}
462+
_ = d.Set("password", d.Get("password").(string))
463+
447464
// set certificate
448465
cert, err := rdbAPI.GetInstanceCertificate(&rdb.GetInstanceCertificateRequest{
449466
Region: region,

scaleway/testdata/data-source-rdb-acl-basic.cassette.yaml

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

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

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

scaleway/testdata/data-source-rdb-database-basic.cassette.yaml

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

scaleway/testdata/data-source-rdb-instance-basic.cassette.yaml

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

scaleway/testdata/data-source-rdb-privilege-basic.cassette.yaml

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

scaleway/testdata/rdb-acl-basic.cassette.yaml

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

scaleway/testdata/rdb-database-backup-basic.cassette.yaml

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

scaleway/testdata/rdb-database-basic.cassette.yaml

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

scaleway/testdata/rdb-privilege-basic.cassette.yaml

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

scaleway/testdata/rdb-user-basic.cassette.yaml

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

0 commit comments

Comments
 (0)