Skip to content

Commit f10c3cc

Browse files
committed
fix(rdb): acl: fill empty values in import generation
1 parent ae6c896 commit f10c3cc

File tree

4 files changed

+746
-615
lines changed

4 files changed

+746
-615
lines changed

scaleway/data_source_rdb_acl_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
88
)
99

10-
func TestAccScalewayDataSourceRdbAcl_Basic(t *testing.T) {
10+
func TestAccScalewayDataSourceRdbACL_Basic(t *testing.T) {
1111
tt := NewTestTools(t)
1212
defer tt.Cleanup()
1313

scaleway/resource_rdb_acl.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,17 @@ func resourceScalewayRdbACLCreate(ctx context.Context, d *schema.ResourceData, m
101101
}
102102

103103
func resourceScalewayRdbACLRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
104-
api, region, err := rdbAPIWithRegion(d, meta)
104+
rdbAPI, region, instanceID, err := rdbAPIWithRegionAndID(meta, d.Id())
105105
if err != nil {
106106
return diag.FromErr(err)
107107
}
108108

109-
instanceID := expandID(d.Get("instance_id").(string))
110-
_, err = waitForRDBInstance(ctx, api, region, instanceID, d.Timeout(schema.TimeoutRead))
109+
_, err = waitForRDBInstance(ctx, rdbAPI, region, instanceID, d.Timeout(schema.TimeoutRead))
111110
if err != nil && !is404Error(err) {
112111
return diag.FromErr(err)
113112
}
114113

115-
res, err := api.ListInstanceACLRules(&rdb.ListInstanceACLRulesRequest{
114+
res, err := rdbAPI.ListInstanceACLRules(&rdb.ListInstanceACLRulesRequest{
116115
Region: region,
117116
InstanceID: instanceID,
118117
}, scw.WithContext(ctx))

0 commit comments

Comments
 (0)