Merge pull request #24730 from sbutler/b-aws_servicecatalog_portfolio_share-sequential-processing

aws_servicecatalog_portfolio_share sequential processing

Author: jar-b

.changelog/24730.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_servicecatalog_portfolio_share: Add global mutex lock around create and delete operations to prevent `ThrottlingException` errors
+```

internal/service/servicecatalog/portfolio_share.go

@@ -101,11 +101,13 @@ func resourcePortfolioShare() *schema.Resource {
 	}
 }
 
+const portfolioShareMutexKey = "aws_servicecatalog_portfolio_share"
+
 func resourcePortfolioShareCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).ServiceCatalogClient(ctx)
 
-	input := &servicecatalog.CreatePortfolioShareInput{
+	input := servicecatalog.CreatePortfolioShareInput{
 		PortfolioId:     aws.String(d.Get("portfolio_id").(string)),
 		SharePrincipals: d.Get("share_principals").(bool),
 		AcceptLanguage:  aws.String(d.Get("accept_language").(string)),
@@ -131,11 +133,14 @@ func resourcePortfolioShareCreate(ctx context.Context, d *schema.ResourceData, m
 		input.ShareTagOptions = v.(bool)
 	}
 
+	conns.GlobalMutexKV.Lock(portfolioShareMutexKey)
+	defer conns.GlobalMutexKV.Unlock(portfolioShareMutexKey)
+
 	var output *servicecatalog.CreatePortfolioShareOutput
 	err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutCreate), func(ctx context.Context) *tfresource.RetryError {
 		var err error
 
-		output, err = conn.CreatePortfolioShare(ctx, input)
+		output, err = conn.CreatePortfolioShare(ctx, &input)
 
 		if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") {
 			return tfresource.RetryableError(err)
@@ -219,7 +224,7 @@ func resourcePortfolioShareUpdate(ctx context.Context, d *schema.ResourceData, m
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).ServiceCatalogClient(ctx)
 
-	input := &servicecatalog.UpdatePortfolioShareInput{
+	input := servicecatalog.UpdatePortfolioShareInput{
 		PortfolioId:    aws.String(d.Get("portfolio_id").(string)),
 		AcceptLanguage: aws.String(d.Get("accept_language").(string)),
 	}
@@ -249,7 +254,7 @@ func resourcePortfolioShareUpdate(ctx context.Context, d *schema.ResourceData, m
 	}
 
 	err := tfresource.Retry(ctx, d.Timeout(schema.TimeoutUpdate), func(ctx context.Context) *tfresource.RetryError {
-		_, err := conn.UpdatePortfolioShare(ctx, input)
+		_, err := conn.UpdatePortfolioShare(ctx, &input)
 
 		if errs.IsAErrorMessageContains[*awstypes.InvalidParametersException](err, "profile does not exist") {
 			return tfresource.RetryableError(err)
@@ -273,7 +278,7 @@ func resourcePortfolioShareDelete(ctx context.Context, d *schema.ResourceData, m
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).ServiceCatalogClient(ctx)
 
-	input := &servicecatalog.DeletePortfolioShareInput{
+	input := servicecatalog.DeletePortfolioShareInput{
 		PortfolioId: aws.String(d.Get("portfolio_id").(string)),
 	}
 
@@ -297,7 +302,10 @@ func resourcePortfolioShareDelete(ctx context.Context, d *schema.ResourceData, m
 		input.OrganizationNode = orgNode
 	}
 
-	output, err := conn.DeletePortfolioShare(ctx, input)
+	conns.GlobalMutexKV.Lock(portfolioShareMutexKey)
+	defer conns.GlobalMutexKV.Unlock(portfolioShareMutexKey)
+
+	output, err := conn.DeletePortfolioShare(ctx, &input)
 
 	if errs.IsA[*awstypes.ResourceNotFoundException](err) {
 		return diags

internal/service/servicecatalog/status.go

@@ -90,7 +90,13 @@ func statusPortfolioShareWithToken(ctx context.Context, conn *servicecatalog.Cli
 			return nil, statusUnavailable, fmt.Errorf("describing portfolio share status: empty response")
 		}
 
-		return output, string(output.Status), err
+		status := output.Status
+		if (status == awstypes.ShareStatusCompletedWithErrors || status == awstypes.ShareStatusError) &&
+			output.ShareDetails != nil && output.ShareDetails.ShareErrors != nil && len(output.ShareDetails.ShareErrors) > 0 {
+			return output, string(status), fmt.Errorf("portfolio share status: %+v", output.ShareDetails.ShareErrors)
+		}
+
+		return output, string(status), err
 	}
 }
 

internal/service/servicecatalog/wait.go

@@ -167,10 +167,10 @@ func waitPortfolioShareReady(ctx context.Context, conn *servicecatalog.Client, p
 	return nil, err
 }
 
-func waitPortfolioShareCreatedWithToken(ctx context.Context, conn *servicecatalog.Client, token string, acceptRequired bool, timeout time.Duration) (*servicecatalog.DescribePortfolioShareStatusOutput, error) {
+func waitPortfolioShareCreatedWithToken(ctx context.Context, conn *servicecatalog.Client, token string, waitForAcceptance bool, timeout time.Duration) (*servicecatalog.DescribePortfolioShareStatusOutput, error) {
 	targets := enum.Slice(awstypes.ShareStatusCompleted)
 
-	if !acceptRequired {
+	if !waitForAcceptance {
 		targets = append(targets, string(awstypes.ShareStatusInProgress))
 	}