From b83632e757bbf6c316a3e11ef984c23ea106bc77 Mon Sep 17 00:00:00 2001 From: Martin Hickey Date: Thu, 22 Oct 2020 11:26:39 +0000 Subject: [PATCH] Update err message to use the regex pattern directly Signed-off-by: Martin Hickey --- pkg/chartutil/validate_name.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/chartutil/validate_name.go b/pkg/chartutil/validate_name.go index 8a71a38c2..913a477cf 100644 --- a/pkg/chartutil/validate_name.go +++ b/pkg/chartutil/validate_name.go @@ -17,6 +17,7 @@ limitations under the License. package chartutil import ( + "fmt" "regexp" "github.com/pkg/errors" @@ -39,11 +40,15 @@ var ( errMissingName = errors.New("no name provided") // errInvalidName indicates that an invalid release name was provided - errInvalidName = errors.New("invalid release name, must match regex ^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])+$ and the length must not be longer than 53") + errInvalidName = errors.New(fmt.Sprintf( + "invalid release name, must match regex %s and the length must not be longer than 53", + validName.String())) // errInvalidKubernetesName indicates that the name does not meet the Kubernetes // restrictions on metadata names. - errInvalidKubernetesName = errors.New("invalid metadata name, must match regex ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$ and the length must not be longer than 253") + errInvalidKubernetesName = errors.New(fmt.Sprintf( + "invalid metadata name, must match regex %s and the length must not be longer than 253", + validName.String())) ) const (