From 1c41af6e1af73ef98467634265a492a652c9348f Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 31 Mar 2023 09:50:39 +0200 Subject: [PATCH 1/2] fix: glue crawler retryable error string fix --- internal/service/glue/crawler.go | 4 ++-- internal/service/glue/trigger.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/glue/crawler.go b/internal/service/glue/crawler.go index 28723f08c184..ef574ed2922f 100644 --- a/internal/service/glue/crawler.go +++ b/internal/service/glue/crawler.go @@ -383,7 +383,7 @@ func resourceCrawlerCreate(ctx context.Context, d *schema.ResourceData, meta int return resource.RetryableError(err) } - if tfawserr.ErrMessageContains(err, glue.ErrCodeInvalidInputException, "Service is unable to assume role") { + if tfawserr.ErrMessageContains(err, glue.ErrCodeInvalidInputException, "Service is unable to assume provided role") { return resource.RetryableError(err) } @@ -536,7 +536,7 @@ func resourceCrawlerUpdate(ctx context.Context, d *schema.ResourceData, meta int return resource.RetryableError(err) } - if tfawserr.ErrMessageContains(err, glue.ErrCodeInvalidInputException, "Service is unable to assume role") { + if tfawserr.ErrMessageContains(err, glue.ErrCodeInvalidInputException, "Service is unable to assume provided role") { return resource.RetryableError(err) } diff --git a/internal/service/glue/trigger.go b/internal/service/glue/trigger.go index ce6382581e46..5af3f37c4ae6 100644 --- a/internal/service/glue/trigger.go +++ b/internal/service/glue/trigger.go @@ -259,7 +259,7 @@ func resourceTriggerCreate(ctx context.Context, d *schema.ResourceData, meta int err := resource.RetryContext(ctx, propagationTimeout, func() *resource.RetryError { _, err := conn.CreateTriggerWithContext(ctx, input) if err != nil { - if tfawserr.ErrMessageContains(err, glue.ErrCodeInvalidInputException, "Service is unable to assume role") { + if tfawserr.ErrMessageContains(err, glue.ErrCodeInvalidInputException, "Service is unable to assume provided role") { return resource.RetryableError(err) } From 1fec83fb4fbeb92d317836d53cf2b1e944276ae4 Mon Sep 17 00:00:00 2001 From: Bruno Schaatsbergen Date: Fri, 31 Mar 2023 09:57:17 +0200 Subject: [PATCH 2/2] Create 30370.txt --- .changelog/30370.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/30370.txt diff --git a/.changelog/30370.txt b/.changelog/30370.txt new file mode 100644 index 000000000000..1a0c0d7bd60e --- /dev/null +++ b/.changelog/30370.txt @@ -0,0 +1,7 @@ +```release-note:bug +resource/aws_glue_crawler: Fix InvalidInputException error string matching +``` + +```release-note:bug +resource/aws_glue_trigger: Fix InvalidInputException error string matching +```