Skip to content

Commit bb056a9

Browse files
committed
fix: tightening up ID and imports
1 parent 210bfab commit bb056a9

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

provider/privatelink/resource_rediscloud_private_link.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func ResourceRedisCloudPrivateLink() *schema.Resource {
5959
},
6060
"principal_type": {
6161
Type: schema.TypeString,
62-
ValidateDiagFunc: validation.ToDiagFunc(validation.StringMatch(regexp.MustCompile("^(aws_account|organization|organization_unit|iam_role|iam_user|service_principal)$"), "must be 'credit-card' or 'marketplace'")),
62+
ValidateDiagFunc: validation.ToDiagFunc(validation.StringMatch(regexp.MustCompile("^(aws_account|organization|organization_unit|iam_role|iam_user|service_principal)$"), "must be one of 'aws_account', 'organization', 'organization_unit', 'iam_role', 'iam_user', 'service_principal'")),
6363
Required: true,
6464
},
6565
"principal_alias": {
@@ -220,6 +220,11 @@ func resourceRedisCloudPrivateLinkRead(ctx context.Context, d *schema.ResourceDa
220220

221221
d.SetId(strconv.Itoa(subId))
222222

223+
err = d.Set("subscription_id", strconv.Itoa(subId))
224+
if err != nil {
225+
return diag.FromErr(err)
226+
}
227+
223228
err = d.Set("share_name", privateLink.ShareName)
224229
if err != nil {
225230
return diag.FromErr(err)
@@ -282,7 +287,7 @@ func resourceRedisCloudPrivateLinkUpdate(ctx context.Context, d *schema.Resource
282287
}
283288

284289
apiPrincipals := privateLink.Principals
285-
tfPrincipals := principalsFromSet(d.Get("principals").(*schema.Set))
290+
tfPrincipals := principalsFromSet(d.Get("principal").(*schema.Set))
286291

287292
principalsToCreate := findPrincipalsToCreate(apiPrincipals, tfPrincipals)
288293
err = createPrincipals(ctx, api, subId, principalsToCreate)

0 commit comments

Comments
 (0)