Merge pull request #44271 from hashicorp/b-athena-datacatalog-bad-error-type

gdavison · web-flow · commit d19a8f6aeb8e · 2025-09-16T23:33:38.000-07:00
aws_athena_data_catalog: Handles incorrect error type now returned by AWS
diff --git a/internal/service/athena/data_catalog.go b/internal/service/athena/data_catalog.go
@@ -198,6 +198,9 @@ func resourceDataCatalogDelete(ctx context.Context, d *schema.ResourceData, meta
 	if errs.IsA[*types.ResourceNotFoundException](err) {
 		return diags
 	}
+	if errs.IsAErrorMessageContains[*types.InvalidRequestException](err, "was not found") {
+		return diags
+	}
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "deleting Athena Data Catalog (%s): %s", d.Id(), err)

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,9 @@ func resourceDataCatalogDelete(ctx context.Context, d *schema.ResourceData, meta`
`198`	`198`	`if errs.IsA[*types.ResourceNotFoundException](err) {`
`199`	`199`	`return diags`
`200`	`200`	`}`
	`201`	`+ if errs.IsAErrorMessageContains[*types.InvalidRequestException](err, "was not found") {`
	`202`	`+ return diags`
	`203`	`+ }`
`201`	`204`
`202`	`205`	`if err != nil {`
`203`	`206`	`return sdkdiag.AppendErrorf(diags, "deleting Athena Data Catalog (%s): %s", d.Id(), err)`