Validate relistDuration is non-negative (#1395)

Author: Erik Nelson

pkg/apis/servicecatalog/validation/broker.go

@@ -18,6 +18,7 @@ package validation
 
 import (
 	apivalidation "k8s.io/apimachinery/pkg/api/validation"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
 	sc "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog"
@@ -137,10 +138,20 @@ func validateClusterServiceBrokerSpec(spec *sc.ClusterServiceBrokerSpec, fldPath
 	if spec.RelistRequests < 0 {
 		allErrs = append(
 			allErrs,
-			field.Required(fldPath.Child("relistRequests"), "relistDuration must be greater than zero"),
+			field.Required(fldPath.Child("relistRequests"), "relistRequests must be greater than zero"),
 		)
 	}
 
+	if spec.RelistDuration != nil {
+		zeroDuration := metav1.Duration{0}
+		if spec.RelistDuration.Duration <= zeroDuration.Duration {
+			allErrs = append(
+				allErrs,
+				field.Required(fldPath.Child("relistDuration"), "relistDuration must be greater than zero"),
+			)
+		}
+	}
+
 	return allErrs
 }
 

pkg/apis/servicecatalog/validation/broker_test.go

@@ -320,6 +320,20 @@ func TestValidateClusterServiceBroker(t *testing.T) {
 			},
 			valid: false,
 		},
+		{
+			name: "invalid broker - negative relistDuration value",
+			broker: &servicecatalog.ClusterServiceBroker{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "test-broker",
+				},
+				Spec: servicecatalog.ClusterServiceBrokerSpec{
+					URL:            "http://example.com",
+					RelistBehavior: servicecatalog.ServiceBrokerRelistBehaviorDuration,
+					RelistDuration: &metav1.Duration{Duration: -15 * time.Minute},
+				},
+			},
+			valid: false,
+		},
 	}
 
 	for _, tc := range cases {