From 8ec4ade572e8ab320b2f5a9145a484a852d31119 Mon Sep 17 00:00:00 2001
From: emaildanwilson <emaildanwilson@gmail.com>
Date: Fri, 14 Jul 2017 11:24:12 -0700
Subject: [PATCH] remove check for GUID regEx from plan externalid

test name guid -> id
---
 .../servicecatalog/validation/serviceclass.go |  4 ----
 .../validation/serviceclass_test.go           | 19 +++++--------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/pkg/apis/servicecatalog/validation/serviceclass.go b/pkg/apis/servicecatalog/validation/serviceclass.go
index f62004623f9..b2cbf495717 100644
--- a/pkg/apis/servicecatalog/validation/serviceclass.go
+++ b/pkg/apis/servicecatalog/validation/serviceclass.go
@@ -115,10 +115,6 @@ func validateServicePlan(plan sc.ServicePlan, fldPath *field.Path) field.ErrorLi
 		allErrs = append(allErrs, field.Required(field.NewPath("description"), "description is required"))
 	}
 
-	for _, msg := range validateExternalID(plan.ExternalID) {
-		allErrs = append(allErrs, field.Invalid(fldPath.Child("externalID"), plan.ExternalID, msg))
-	}
-
 	return allErrs
 }
 
diff --git a/pkg/apis/servicecatalog/validation/serviceclass_test.go b/pkg/apis/servicecatalog/validation/serviceclass_test.go
index 5cfb13343af..08ff539bd25 100644
--- a/pkg/apis/servicecatalog/validation/serviceclass_test.go
+++ b/pkg/apis/servicecatalog/validation/serviceclass_test.go
@@ -90,15 +90,6 @@ func TestValidateServiceClass(t *testing.T) {
 			}(),
 			valid: false,
 		},
-		{
-			name: "invalid serviceClass - invalid guid",
-			serviceClass: func() *servicecatalog.ServiceClass {
-				s := validServiceClass()
-				s.ExternalID = "1234-4354a\\%-49b"
-				return s
-			}(),
-			valid: false,
-		},
 		{
 			name: "invalid serviceClass - missing description",
 			serviceClass: func() *servicecatalog.ServiceClass {
@@ -118,19 +109,19 @@ func TestValidateServiceClass(t *testing.T) {
 			valid: false,
 		},
 		{
-			name: "invalid serviceClass - invalid plan guid",
+			name: "valid serviceClass - special charaters in plan id",
 			serviceClass: func() *servicecatalog.ServiceClass {
 				s := validServiceClass()
-				s.Plans[0].ExternalID = "40d-0983-1b89-★"
+				s.Plans[0].ExternalID = "40D-0983-1b89.plan!%'<>~¥"
 				return s
 			}(),
-			valid: false,
+			valid: true,
 		},
 		{
-			name: "invalid serviceClass - missing plan guid",
+			name: "invalid serviceClass - missing plan id",
 			serviceClass: func() *servicecatalog.ServiceClass {
 				s := validServiceClass()
-				s.Plans[0].ExternalID = "40d-0983-1b89-★"
+				s.Plans[0].ExternalID = ""
 				return s
 			}(),
 			valid: false,