Skip to content

Commit 210bfab

Browse files
committed
fix: other ID issues
1 parent c31be45 commit 210bfab

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

provider/privatelink/resource_rediscloud_active_active_private_link.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func ResourceRedisCloudActiveActivePrivateLink() *schema.Resource {
6666
},
6767
"principal_type": {
6868
Type: schema.TypeString,
69-
ValidateDiagFunc: validation.ToDiagFunc(validation.StringMatch(regexp.MustCompile("^(aws_account|organization|organization_unit|iam_role|iam_user|service_principal)$"), "Must be an allowed Principal Type. ('aws_account', 'organization', 'organization_unit', 'iam_role', 'iam_user')'")),
69+
ValidateDiagFunc: validation.ToDiagFunc(validation.StringMatch(regexp.MustCompile("^(aws_account|organization|organization_unit|iam_role|iam_user|service_principal)$"), "Must be an allowed Principal Type. ('aws_account', 'organization', 'organization_unit', 'iam_role', 'iam_user', 'service_principal')'")),
7070
Required: true,
7171
},
7272
"principal_alias": {
@@ -181,8 +181,6 @@ func resourceRedisCloudActiveActivePrivateLinkCreate(ctx context.Context, d *sch
181181
return diag.FromErr(err)
182182
}
183183

184-
d.SetId(strconv.Itoa(subId))
185-
186184
err = waitForActiveActivePrivateLinkToBeActive(ctx, api, subId, regionId)
187185

188186
if err != nil {
@@ -226,8 +224,7 @@ func resourceRedisCloudActiveActivePrivateLinkRead(ctx context.Context, d *schem
226224
if err != nil {
227225
return diag.FromErr(err)
228226
}
229-
230-
err = d.Set("subscription_id", subId)
227+
err = d.Set("subscription_id", strconv.Itoa(subId))
231228

232229
if err != nil {
233230
return diag.FromErr(err)
@@ -252,8 +249,6 @@ func resourceRedisCloudActiveActivePrivateLinkRead(ctx context.Context, d *schem
252249
return diag.FromErr(err)
253250
}
254251

255-
d.SetId(strconv.Itoa(subId))
256-
257252
err = d.Set("share_name", privateLink.ShareName)
258253
if err != nil {
259254
return diag.FromErr(err)

0 commit comments

Comments
 (0)