Allow underscores in plan names (#610)

Author: pmorie

pkg/apis/servicecatalog/validation/instance.go

@@ -55,7 +55,7 @@ func validateInstanceSpec(spec *sc.InstanceSpec, fldPath *field.Path, create boo
 		allErrs = append(allErrs, field.Required(fldPath.Child("planName"), "planName is required"))
 	}
 
-	for _, msg := range validateServicePlanName(spec.PlanName, false /* prefix */) {
+	for _, msg := range validateServicePlanName(spec.PlanName) {
 		allErrs = append(allErrs, field.Invalid(fldPath.Child("planName"), spec.PlanName, msg))
 	}
 

pkg/apis/servicecatalog/validation/serviceclass.go

@@ -30,9 +30,6 @@ import (
 // validateServiceClassName is the validation function for ServiceClass names.
 var validateServiceClassName = apivalidation.NameIsDNSSubdomain
 
-// validateServicePlanName is the validation function for ServicePlan names.
-var validateServicePlanName = apivalidation.NameIsDNSLabel
-
 // validateOSBGuid is the validation function for OSB GUIDs.  We generate
 // GUIDs for Instances and Bindings, but for ServiceClass and ServicePlan,
 // they are part of the payload returned from the Broker.
@@ -96,7 +93,7 @@ func ValidateServiceClass(serviceclass *sc.ServiceClass) field.ErrorList {
 func validateServicePlan(plan sc.ServicePlan, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
 
-	for _, msg := range validateServicePlanName(plan.Name, false /* prefix */) {
+	for _, msg := range validateServicePlanName(plan.Name) {
 		allErrs = append(allErrs, field.Invalid(fldPath.Child("name"), plan.Name, msg))
 	}
 
@@ -111,6 +108,24 @@ func validateServicePlan(plan sc.ServicePlan, fldPath *field.Path) field.ErrorLi
 	return allErrs
 }
 
+const servicePlanNameFmt string = `[-_a-z0-9]+`
+const servicePlanNameMaxLength int = 63
+
+var servicePlanNameRegexp = regexp.MustCompile("^" + servicePlanNameFmt + "$")
+
+// validateServicePlanName is the validation function for ServicePlan names.
+func validateServicePlanName(value string) []string {
+	var errs []string
+	if len(value) > servicePlanNameMaxLength {
+		errs = append(errs, utilvalidation.MaxLenError(servicePlanNameMaxLength))
+	}
+	if !servicePlanNameRegexp.MatchString(value) {
+		errs = append(errs, utilvalidation.RegexError(servicePlanNameFmt, "plan-name", "plan_name"))
+	}
+
+	return errs
+}
+
 // ValidateServiceClassUpdate checks that when changing from an older
 // ServiceClass to a newer ServiceClass is okay.
 func ValidateServiceClassUpdate(new *sc.ServiceClass, old *sc.ServiceClass) field.ErrorList {

pkg/apis/servicecatalog/validation/serviceclass_test.go

@@ -48,6 +48,24 @@ func TestValidateServiceClass(t *testing.T) {
 			},
 			valid: true,
 		},
+		{
+			name: "valid serviceClass - plan with underscore in name",
+			serviceClass: &servicecatalog.ServiceClass{
+				ObjectMeta: kapi.ObjectMeta{
+					Name: "test-serviceclass",
+				},
+				Bindable:   true,
+				BrokerName: "test-broker",
+				OSBGUID:    "1234-4354a-49b",
+				Plans: []servicecatalog.ServicePlan{
+					{
+						Name:    "test_plan",
+						OSBGUID: "40d-0983-1b89",
+					},
+				},
+			},
+			valid: true,
+		},
 		{
 			name: "valid serviceClass - uppercase in GUID",
 			serviceClass: &servicecatalog.ServiceClass{