Add suppress diff for URL change that only change / (remove or add) in UC resources (#2336)

This fixes #2335

Co-authored-by: Fabian Jakobs <[email protected]>

Author: alexott

catalog/resource_catalog.go

@@ -3,11 +3,20 @@ package catalog
 import (
 	"context"
 	"fmt"
+	"log"
 
 	"github.com/databricks/terraform-provider-databricks/common"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
+func ucDirectoryPathSuppressDiff(k, old, new string, d *schema.ResourceData) bool {
+	if (new == (old + "/")) || (old == (new + "/")) {
+		log.Printf("[DEBUG] Ignoring configuration drift from %s to %s", old, new)
+		return true
+	}
+	return false
+}
+
 type CatalogsAPI struct {
 	client  *common.DatabricksClient
 	context context.Context
@@ -68,6 +77,7 @@ func ResourceCatalog() *schema.Resource {
 				Optional: true,
 				Default:  false,
 			}
+			m["storage_root"].DiffSuppressFunc = ucDirectoryPathSuppressDiff
 			return m
 		})
 	update := updateFunctionFactory("/unity-catalog/catalogs", []string{"owner", "comment", "properties"})

catalog/resource_catalog_test.go

@@ -303,3 +303,12 @@ func TestCatalogCreateDeltaSharing(t *testing.T) {
 		`,
 	}.ApplyNoError(t)
 }
+
+func TestUcDirectoryPathSuppressDiff(t *testing.T) {
+	assert.True(t, ucDirectoryPathSuppressDiff("", "abfss://[email protected]/TF_DIR_WITH_SLASH",
+		"abfss://[email protected]/TF_DIR_WITH_SLASH/", nil))
+	assert.True(t, ucDirectoryPathSuppressDiff("", "abfss://[email protected]/TF_DIR_WITH_SLASH/",
+		"abfss://[email protected]/TF_DIR_WITH_SLASH", nil))
+	assert.False(t, ucDirectoryPathSuppressDiff("", "abfss://[email protected]/new_dir",
+		"abfss://[email protected]/TF_DIR_WITH_SLASH/", nil))
+}

catalog/resource_external_location.go

@@ -46,6 +46,7 @@ func ResourceExternalLocation() *schema.Resource {
 			m["skip_validation"].DiffSuppressFunc = func(k, old, new string, d *schema.ResourceData) bool {
 				return old == "false" && new == "true"
 			}
+			m["url"].DiffSuppressFunc = ucDirectoryPathSuppressDiff
 			return m
 		})
 	update := updateFunctionFactory("/unity-catalog/external-locations", []string{"owner", "comment", "url", "credential_name"})

catalog/resource_schema.go

@@ -73,6 +73,7 @@ func ResourceSchema() *schema.Resource {
 				Optional: true,
 				Default:  false,
 			}
+			m["storage_root"].DiffSuppressFunc = ucDirectoryPathSuppressDiff
 			return m
 		})
 	update := updateFunctionFactory("/unity-catalog/schemas", []string{"owner", "comment", "properties"})