separate forceDelete function

databricks · Sep 2, 2022 · 01ea46e · 01ea46e
1 parent e52b7a3
commit 01ea46e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 24 deletions.
diff --git a/catalog/resource_catalog.go b/catalog/resource_catalog.go
@@ -43,19 +43,22 @@ func (a CatalogsAPI) getCatalog(name string) (ci CatalogInfo, err error) {
 	return
 }
 
-func (a CatalogsAPI) deleteCatalog(name string, force bool) error {
-	if force {
-		schemasAPI := NewSchemasAPI(a.context, a.client)
-		schemas, err := schemasAPI.listByCatalog(name)
-		if err != nil {
-			return err
-		}
-		for _, s := range schemas.Schemas {
-			if s.Name != name+".information_schema" {
-				schemasAPI.deleteSchema(s.FullName, true)
-			}
+func (a CatalogsAPI) deleteCatalog(name string) error {
+	return a.client.Delete(a.context, "/unity-catalog/catalogs/"+name, nil)
+}
+
+func (a CatalogsAPI) forceDeleteCatalog(name string) error {
+	schemasAPI := NewSchemasAPI(a.context, a.client)
+	schemas, err := schemasAPI.listByCatalog(name)
+	if err != nil {
+		return err
+	}
+	for _, s := range schemas.Schemas {
+		if s.Name != name+".information_schema" {
+			schemasAPI.forceDeleteSchema(s.FullName)
 		}
 	}
+
 	return a.client.Delete(a.context, "/unity-catalog/catalogs/"+name, nil)
 }
 
@@ -78,7 +81,7 @@ func ResourceCatalog() *schema.Resource {
 			if err := NewCatalogsAPI(ctx, c).createCatalog(&ci); err != nil {
 				return err
 			}
-			if err := NewSchemasAPI(ctx, c).deleteSchema(ci.Name+".default", false); err != nil {
+			if err := NewSchemasAPI(ctx, c).deleteSchema(ci.Name + ".default"); err != nil {
 				return fmt.Errorf("cannot remove new catalog default schema: %w", err)
 			}
 			d.SetId(ci.Name)
@@ -94,7 +97,11 @@ func ResourceCatalog() *schema.Resource {
 		Update: update,
 		Delete: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
 			force := d.Get("force_destroy").(bool)
-			return NewCatalogsAPI(ctx, c).deleteCatalog(d.Id(), force)
+			if force {
+				return NewCatalogsAPI(ctx, c).forceDeleteCatalog(d.Id())
+			} else {
+				return NewCatalogsAPI(ctx, c).deleteCatalog(d.Id())
+			}
 		},
 	}.ToResource()
 }
diff --git a/catalog/resource_schema.go b/catalog/resource_schema.go
@@ -47,16 +47,18 @@ func (a SchemasAPI) getSchema(name string) (si SchemaInfo, err error) {
 	return
 }
 
-func (a SchemasAPI) deleteSchema(name string, force bool) error {
-	if force {
-		tablesAPI := NewTablesAPI(a.context, a.client)
-		tables, err := tablesAPI.listTables(strings.Split(name, ".")[0], strings.Split(name, ".")[1])
-		if err != nil {
-			return err
-		}
-		for _, v := range tables.Tables {
-			tablesAPI.deleteTable(v.FullName())
-		}
+func (a SchemasAPI) deleteSchema(name string) error {
+	return a.client.Delete(a.context, "/unity-catalog/schemas/"+name, nil)
+}
+
+func (a SchemasAPI) forceDeleteSchema(name string) error {
+	tablesAPI := NewTablesAPI(a.context, a.client)
+	tables, err := tablesAPI.listTables(strings.Split(name, ".")[0], strings.Split(name, ".")[1])
+	if err != nil {
+		return err
+	}
+	for _, v := range tables.Tables {
+		tablesAPI.deleteTable(v.FullName())
 	}
 	return a.client.Delete(a.context, "/unity-catalog/schemas/"+name, nil)
 }
@@ -94,7 +96,10 @@ func ResourceSchema() *schema.Resource {
 		Update: update,
 		Delete: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
 			force := d.Get("force_destroy").(bool)
-			return NewSchemasAPI(ctx, c).deleteSchema(d.Id(), force)
+			if force {
+				return NewSchemasAPI(ctx, c).forceDeleteSchema(d.Id())
+			}
+			return NewSchemasAPI(ctx, c).deleteSchema(d.Id())
 		},
 	}.ToResource()
 }