Add id field validator and apply to context ids

To avoid entry of invalid ids to the context fields.

Signed-off-by: Kobi Samoray <[email protected]>

nsxt/policy_utils.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"regexp"
 	"strings"
 	"time"
 
@@ -447,6 +448,14 @@ func isPolicyPath(policyPath string) bool {
 	return true
 }
 
+func isValidID(id string) bool {
+	v, err := regexp.MatchString("^[0-9a-zA-Z_\\-]+$", id)
+	if err != nil {
+		return false
+	}
+	return v
+}
+
 func getPolicyIDFromPath(path string) string {
 	tokens := strings.Split(path, "/")
 	return tokens[len(tokens)-1]

nsxt/utils.go

@@ -687,7 +687,7 @@ func getContextSchema(isRequired, isComputed, isVPC bool) *schema.Schema {
 			Description:  "Id of the project which the resource belongs to.",
 			Required:     true,
 			ForceNew:     true,
-			ValidateFunc: validation.StringIsNotWhiteSpace,
+			ValidateFunc: validateID(),
 		},
 	}
 	if isVPC {
@@ -696,7 +696,7 @@ func getContextSchema(isRequired, isComputed, isVPC bool) *schema.Schema {
 			Description:  "Id of the VPC which the resource belongs to.",
 			Required:     true,
 			ForceNew:     true,
-			ValidateFunc: validation.StringIsNotWhiteSpace,
+			ValidateFunc: validateID(),
 		}
 	}
 	return &schema.Schema{

nsxt/validators.go

@@ -423,6 +423,22 @@ func validatePolicyPath() schema.SchemaValidateFunc {
 	}
 }
 
+func validateID() schema.SchemaValidateFunc {
+	return func(i interface{}, k string) (s []string, es []error) {
+		v, ok := i.(string)
+		if !ok {
+			es = append(es, fmt.Errorf("expected type of %s to be string", k))
+			return
+		}
+
+		if !isValidID(v) {
+			es = append(es, fmt.Errorf("invalid ID atrribute: %s", v))
+		}
+
+		return
+	}
+}
+
 func validateVLANId(i interface{}, k string) (s []string, es []error) {
 	var vlan int
 	vlan, ok := i.(int)