Merge pull request #1592 from vmware/ease-id-validation

Ease validation on project and vpc ids

Author: annakhm

Diff for: nsxt/policy_utils.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"log"
 	"net/url"
-	"regexp"
 	"strings"
 	"time"
 
@@ -539,11 +538,7 @@ func isPolicyPath(policyPath string) bool {
 }
 
 func isValidID(id string) bool {
-	v, err := regexp.MatchString("^[0-9a-zA-Z_\\-]+$", id)
-	if err != nil {
-		return false
-	}
-	return v
+	return !strings.ContainsAny(id, "/&")
 }
 
 func getPolicyIDFromPath(path string) string {

Diff for: nsxt/resource_nsxt_vpc_test.go

@@ -117,6 +117,28 @@ func TestAccResourceNsxtVpc_basic(t *testing.T) {
 	})
 }
 
+func TestAccResourceNsxtVpc_withID(t *testing.T) {
+	testResourceName := "nsxt_vpc.test"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t); testAccOnlyVPC(t) },
+		Providers: testAccProviders,
+		CheckDestroy: func(state *terraform.State) error {
+			return testAccNsxtVpcCheckDestroy(state, accTestVpcCreateAttributes["display_name"])
+		},
+		Steps: []resource.TestStep{
+			{
+				Config: testAccNsxtVpcWithID(),
+				Check: resource.ComposeTestCheckFunc(
+					testAccNsxtVpcExists(accTestVpcCreateAttributes["display_name"], testResourceName),
+					resource.TestCheckResourceAttr(testResourceName, "display_name", accTestVpcCreateAttributes["display_name"]),
+					resource.TestCheckResourceAttr(testResourceName, "short_id", accTestVpcCreateAttributes["short_id"]),
+				),
+			},
+		},
+	})
+}
+
 func TestAccResourceNsxtVpc_importBasic(t *testing.T) {
 	name := getAccTestResourceName()
 	testResourceName := "nsxt_vpc.test"
@@ -262,6 +284,17 @@ resource "nsxt_vpc" "test" {
 }`, testAccNsxtProjectContext(), accTestVpcUpdateAttributes["display_name"], accTestVpcUpdateAttributes["short_id"])
 }
 
+func testAccNsxtVpcWithID() string {
+	return testAccNsxtVpcPrerequisites() + fmt.Sprintf(`
+resource "nsxt_vpc" "test" {
+  %s
+
+  nsx_id       = "test.%s"
+  display_name = "%s"
+  short_id     = "%s"
+}`, testAccNsxtProjectContext(), accTestVpcCreateAttributes["display_name"], accTestVpcCreateAttributes["display_name"], accTestVpcCreateAttributes["short_id"])
+}
+
 // We use short_id as nsx_id to make sure NSX populates the short_id correctly
 func testAccNsxtVpcMinimalisticNoShortId() string {
 	return testAccNsxtVpcPrerequisites() + fmt.Sprintf(`