fixed as the review of adamreese: update the err message when releasename is empty and update the test units.

pull/2564/head
devinyan 8 years ago
parent 715fdf1d0f
commit 645cc4e8f6

@ -363,6 +363,10 @@ func validateManifest(c environment.KubeClient, ns string, manifest []byte) erro
} }
func validateReleaseName(releaseName string) error { func validateReleaseName(releaseName string) error {
if releaseName == "" {
return errMissingRelease
}
if !ValidName.MatchString(releaseName) || (len(releaseName) > releaseNameMaxLen) { if !ValidName.MatchString(releaseName) || (len(releaseName) > releaseNameMaxLen) {
return errInvalidName return errInvalidName
} }

@ -183,23 +183,23 @@ func upgradeReleaseVersion(rel *release.Release) *release.Release {
} }
func TestValidName(t *testing.T) { func TestValidName(t *testing.T) {
for name, valid := range map[string]bool{ for name, valid := range map[string]error{
"nina pinta santa-maria": false, "nina pinta santa-maria": errInvalidName,
"nina-pinta-santa-maria": true, "nina-pinta-santa-maria": nil,
"-nina": false, "-nina": errInvalidName,
"pinta-": false, "pinta-": errInvalidName,
"santa-maria": true, "santa-maria": nil,
"niña": false, "niña": errInvalidName,
"...": false, "...": errInvalidName,
"pinta...": false, "pinta...": errInvalidName,
"santa...maria": true, "santa...maria": nil,
"": false, "": errMissingRelease,
" ": false, " ": errInvalidName,
".nina.": false, ".nina.": errInvalidName,
"nina.pinta": true, "nina.pinta": nil,
"abcdefghi-abcdefghi-abcdefghi-abcdefghi-abcdefghi-abcd": false, "abcdefghi-abcdefghi-abcdefghi-abcdefghi-abcdefghi-abcd": errInvalidName,
} { } {
if valid != (validateReleaseName(name) == nil) { if valid != validateReleaseName(name) {
t.Errorf("Expected %q to be %t", name, valid) t.Errorf("Expected %q to be %t", name, valid)
} }
} }

Loading…
Cancel
Save