Merge pull request #29735 from zjalicf-cyberlab/b-apigatewayv2-error-…

…handling fix: apigatewayv2 error handling for ConflictException: Unable to complete operation due to concurrent modification.
hashicorp · Mar 10, 2023 · 699dd0c · 699dd0c
2 parents 35d8091 + 5aed50f
commit 699dd0c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/.changelog/29735.txt b/.changelog/29735.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_apigatewayv2_integration: Retry errors like `ConflictException: Unable to complete operation due to concurrent modification. Please try again later.`
+```
diff --git a/internal/conns/config.go b/internal/conns/config.go
@@ -11,6 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/endpoints"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/apigateway"
+	"github.com/aws/aws-sdk-go/service/apigatewayv2"
 	"github.com/aws/aws-sdk-go/service/appconfig"
 	"github.com/aws/aws-sdk-go/service/applicationautoscaling"
 	"github.com/aws/aws-sdk-go/service/appsync"
@@ -267,6 +268,15 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS
 		}
 	})
 
+	client.apigatewayv2Conn.Handlers.Retry.PushBack(func(r *request.Request) {
+		// Many operations can return an error such as:
+		//   ConflictException: Unable to complete operation due to concurrent modification. Please try again later.
+		// Handle them all globally for the service client.
+		if tfawserr.ErrMessageContains(r.Error, apigatewayv2.ErrCodeConflictException, "try again later") {
+			r.Retryable = aws.Bool(true)
+		}
+	})
+
 	// Workaround for https://github.com/aws/aws-sdk-go/issues/1472
 	client.applicationautoscalingConn.Handlers.Retry.PushBack(func(r *request.Request) {
 		if !strings.HasPrefix(r.Operation.Name, "Describe") && !strings.HasPrefix(r.Operation.Name, "List") {