Validate that a ServiceClass must have at least one plan (openshift#879)

soltysh · May 25, 2017 · 7295dad · 7295dad
1 parent 9db9fa4
commit 7295dad
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/pkg/apis/servicecatalog/validation/serviceclass.go b/pkg/apis/servicecatalog/validation/serviceclass.go
@@ -81,6 +81,10 @@ func ValidateServiceClass(serviceclass *sc.ServiceClass) field.ErrorList {
  allErrs = append(allErrs, field.Invalid(field.NewPath("externalID"), serviceclass.ExternalID, msg))
  }
 
+ if len(serviceclass.Plans) < 1 {
+ allErrs = append(allErrs, field.Invalid(field.NewPath("plans"), serviceclass.Plans, "at least one plan is required"))
+ }
+
  planNames := sets.NewString()
  for i, plan := range serviceclass.Plans {
  planPath := field.NewPath("plans").Index(i)

diff --git a/pkg/apis/servicecatalog/validation/serviceclass_test.go b/pkg/apis/servicecatalog/validation/serviceclass_test.go
@@ -144,6 +144,15 @@ func TestValidateServiceClass(t *testing.T) {
  }(),
  valid: false,
  },
+ {
+ name: "invalid serviceClass - no plans",
+ serviceClass: func() *servicecatalog.ServiceClass {
+ s := validServiceClass()
+ s.Plans = nil
+ return s
+ }(),
+ valid: false,
+ },
  }
 
  for _, tc := range cases {

diff --git a/test/integration/clientset_test.go b/test/integration/clientset_test.go
@@ -340,6 +340,13 @@ func testServiceClassClient(sType server.StorageType, client servicecatalogclien
  Bindable: true,
  ExternalID: "b8269ab4-7d2d-456d-8c8b-5aab63b321d1",
  Description: "test description",
+ Plans: []v1alpha1.ServicePlan{
+ {
+ Name: "test-service-plan",
+ ExternalID: "test-service-plan-external-id",
+ Description: "test-description",
+ },
+ },
  }
 
  // start from scratch