From 034981e7bca3e7181adbf0b8c960a09c4783a4c7 Mon Sep 17 00:00:00 2001 From: Dan Wilson Date: Fri, 14 Jul 2017 09:10:13 -0700 Subject: [PATCH] Allow for a period in the GUID of the External ID add unit test case --- pkg/apis/servicecatalog/validation/serviceclass.go | 2 +- pkg/apis/servicecatalog/validation/serviceclass_test.go | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/apis/servicecatalog/validation/serviceclass.go b/pkg/apis/servicecatalog/validation/serviceclass.go index f62004623f9..39c463deb03 100644 --- a/pkg/apis/servicecatalog/validation/serviceclass.go +++ b/pkg/apis/servicecatalog/validation/serviceclass.go @@ -30,7 +30,7 @@ import ( // validateServiceClassName is the validation function for ServiceClass names. var validateServiceClassName = apivalidation.NameIsDNSSubdomain -const guidFmt string = "[a-zA-Z0-9]([-a-zA-Z0-9]*[a-zA-Z0-9])?" +const guidFmt string = "[a-zA-Z0-9]([-a-zA-Z0-9.]*[a-zA-Z0-9])?" const guidMaxLength int = 63 // guidRegexp is a loosened validation for diff --git a/pkg/apis/servicecatalog/validation/serviceclass_test.go b/pkg/apis/servicecatalog/validation/serviceclass_test.go index 5cfb13343af..0cb9625a6ce 100644 --- a/pkg/apis/servicecatalog/validation/serviceclass_test.go +++ b/pkg/apis/servicecatalog/validation/serviceclass_test.go @@ -72,6 +72,15 @@ func TestValidateServiceClass(t *testing.T) { }(), valid: true, }, + { + name: "valid serviceClass - period in GUID", + serviceClass: func() *servicecatalog.ServiceClass { + s := validServiceClass() + s.ExternalID = "4315f5e1-0139-4ecf-9706-9df0aff33e5a.plan-name" + return s + }(), + valid: true, + }, { name: "invalid serviceClass - has namespace", serviceClass: func() *servicecatalog.ServiceClass {