Merge pull request #21227 from DrFaust92/r/glue_catalog_delete

r/glue_catalog_table - ignore not exists errors on delete
hashicorp · Oct 13, 2021 · 6199529 · 6199529
2 parents 9a75560 + 70268d1
commit 6199529
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/.changelog/21227.txt b/.changelog/21227.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/glue_catalog_table: Ignore not exists errors on delete
+```
diff --git a/aws/resource_aws_glue_catalog_table.go b/aws/resource_aws_glue_catalog_table.go
@@ -492,6 +492,9 @@ func resourceAwsGlueCatalogTableDelete(d *schema.ResourceData, meta interface{})
 		DatabaseName: aws.String(dbName),
 	})
 	if err != nil {
+		if isAWSErr(err, glue.ErrCodeEntityNotFoundException, "") {
+			return nil
+		}
 		return fmt.Errorf("Error deleting Glue Catalog Table: %w", err)
 	}
 	return nil

diff --git a/aws/resource_aws_glue_catalog_table_test.go b/aws/resource_aws_glue_catalog_table_test.go
@@ -597,6 +597,7 @@ func TestAccAWSGlueCatalogTable_disappears_database(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGlueCatalogTableExists(resourceName),
 					testAccCheckResourceDisappears(testAccProvider, resourceAwsGlueCatalogDatabase(), "aws_glue_catalog_database.test"),
+					testAccCheckResourceDisappears(testAccProvider, resourceAwsGlueCatalogTable(), resourceName),
 				),
 				ExpectNonEmptyPlan: true,
 			},
@@ -650,6 +651,7 @@ func TestAccAWSGlueCatalogTable_disappears(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGlueCatalogTableExists(resourceName),
 					testAccCheckResourceDisappears(testAccProvider, resourceAwsGlueCatalogTable(), resourceName),
+					testAccCheckResourceDisappears(testAccProvider, resourceAwsGlueCatalogTable(), resourceName),
 				),
 				ExpectNonEmptyPlan: true,
 			},