Additional IAM eventual consistency checks.

hashicorp · Nov 10, 2020 · 261a32f · 261a32f
1 parent 8c8be85
commit 261a32f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/aws/internal/service/kinesisanalytics/waiter/waiter.go b/aws/internal/service/kinesisanalytics/waiter/waiter.go
@@ -53,6 +53,11 @@ func IAMPropagation(f func() (interface{}, error)) (interface{}, error) {
 			return resource.RetryableError(err)
 		}
 
+		// S3: https://github.com/hashicorp/terraform-provider-aws/issues/16104
+		if tfawserr.ErrMessageContains(err, kinesisanalytics.ErrCodeInvalidArgumentException, "Please check the role provided or validity of S3 location you provided") {
+			return resource.RetryableError(err)
+		}
+
 		if err != nil {
 			return resource.NonRetryableError(err)
 		}

diff --git a/aws/internal/service/kinesisanalyticsv2/waiter/waiter.go b/aws/internal/service/kinesisanalyticsv2/waiter/waiter.go
@@ -53,6 +53,11 @@ func IAMPropagation(f func() (interface{}, error)) (interface{}, error) {
 			return resource.RetryableError(err)
 		}
 
+		// S3: https://github.com/hashicorp/terraform-provider-aws/issues/16104
+		if tfawserr.ErrMessageContains(err, kinesisanalyticsv2.ErrCodeInvalidArgumentException, "Please check the role provided or validity of S3 location you provided") {
+			return resource.RetryableError(err)
+		}
+
 		if err != nil {
 			return resource.NonRetryableError(err)
 		}