Merge pull request #95 from storey247/ds/adls2mountvalidation

Standardised the validate logic found azure mounts

databricks/mounts.go

@@ -435,3 +435,12 @@ func ProcessAzureWasbAbfssUris(uri string) (string, string, string, error) {
 	}
 	return containerName, storageAccount, directory, nil
 }
+
+// ValidateMountDirectory is a ValidateFunc that ensures the mount directory starts with a '/'
+func ValidateMountDirectory(val interface{}, key string) (warns []string, errs []error) {
+	v := val.(string)
+	if v != "" && !strings.HasPrefix(v, "/") {
+		return nil, []error{fmt.Errorf("%s must start with /, got: %s", key, v)}
+	}
+	return nil, nil
+}

databricks/mounts_test.go

@@ -0,0 +1,23 @@
+package databricks
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestValidateMountDirectory(t *testing.T) {
+	testCases := []struct {
+        directory  string
+        errorCount  int
+    }{
+        {"", 0},
+        {"/directory", 0},
+        {"directory", 1},
+    }
+    for _, tc := range testCases {
+        _, errs := ValidateMountDirectory(tc.directory, "key")
+
+        assert.Lenf(t, errs, tc.errorCount, "directory '%s' does not generate the expected error count", tc.directory)
+    }
+}

databricks/resource_databricks_azure_adls_gen1_mount.go

@@ -40,14 +40,7 @@ func resourceAzureAdlsGen1Mount() *schema.Resource {
 				Computed: true,
 				//Default:  "/",
 				ForceNew: true,
-				ValidateFunc: func(val interface{}, key string) (warns []string, errors []error) {
-					directory := val.(string)
-					if strings.HasPrefix(directory, "/") {
-						return
-					}
-					errors = append(errors, fmt.Errorf("%s must start with /, got: %s", key, val))
-					return
-				},
+				ValidateFunc: ValidateMountDirectory,
 			},
 			"mount_name": {
 				Type:     schema.TypeString,

databricks/resource_databricks_azure_adls_gen2_mount.go

@@ -36,6 +36,7 @@ func resourceAzureAdlsGen2Mount() *schema.Resource {
 				Optional: true,
 				Computed: true,
 				ForceNew: true,
+				ValidateFunc: ValidateMountDirectory,
 			},
 			"mount_name": {
 				Type:     schema.TypeString,

databricks/resource_databricks_azure_blob_mount.go

@@ -38,14 +38,7 @@ func resourceAzureBlobMount() *schema.Resource {
 				Computed: true,
 				//Default:  "/",
 				ForceNew: true,
-				ValidateFunc: func(val interface{}, key string) (warns []string, errors []error) {
-					directory := val.(string)
-					if strings.HasPrefix(directory, "/") {
-						return
-					}
-					errors = append(errors, fmt.Errorf("%s must start with /, got: %s", key, val))
-					return
-				},
+				ValidateFunc: ValidateMountDirectory,
 			},
 			"mount_name": {
 				Type:     schema.TypeString,