Merge pull request #23879 from hashicorp/add-retry-for-lambda-update-…

…conflict r/lambda_function: add `ResourceConflictException` error handling on create and update
hashicorp · Mar 25, 2022 · 30cb070 · 30cb070
2 parents 1af230d + 41b833f
commit 30cb070
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/.changelog/23879.txt b/.changelog/23879.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_lambda_function: Add error handling for `ResourceConflictException` errors on create and update
+```
diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go
@@ -578,6 +578,11 @@ func resourceFunctionCreate(d *schema.ResourceData, meta interface{}) error {
 			return resource.RetryableError(err)
 		}
 
+		if tfawserr.ErrCodeEquals(err, lambda.ErrCodeResourceConflictException) {
+			log.Printf("[DEBUG] Received %s, retrying CreateFunction", err)
+			return resource.RetryableError(err)
+		}
+
 		if err != nil {
 			return resource.NonRetryableError(err)
 		}
@@ -1136,6 +1141,11 @@ func resourceFunctionUpdate(d *schema.ResourceData, meta interface{}) error {
 				return resource.RetryableError(err)
 			}
 
+			if tfawserr.ErrCodeEquals(err, lambda.ErrCodeResourceConflictException) {
+				log.Printf("[DEBUG] Received %s, retrying UpdateFunctionConfiguration", err)
+				return resource.RetryableError(err)
+			}
+
 			if err != nil {
 				return resource.NonRetryableError(err)
 			}