github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Fixed empty name error and also changed tests

Browse Source
This commit is contained in:
Manan Saraf 2015-06-09 15:19:04 -07:00
parent 366b382901
commit b2ebfeef25
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/validation/validation.go
View File

@ -212,10 +212,11 @@ func ValidateObjectMeta(meta *api.ObjectMeta, requiresNamespace bool, nameFn Val
allErrs = append(allErrs, errs.NewFieldInvalid("generateName", meta.GenerateName, qualifier)) allErrs = append(allErrs, errs.NewFieldInvalid("generateName", meta.GenerateName, qualifier))
} }
} }
// if the generated name validates, but the calculated value does not, it's a problem with generation, and we // If the generated name validates, but the calculated value does not, it's a problem with generation, and we
// report it here. This may confuse users, but indicates a programming bug and still must be validated. // report it here. This may confuse users, but indicates a programming bug and still must be validated.
// If there are multiple fields out of which one is required then add a or as a seperator
if len(meta.Name) == 0 { if len(meta.Name) == 0 {
allErrs = append(allErrs, errs.NewFieldRequired("name")) allErrs = append(allErrs, errs.NewFieldRequired("name or generateName"))
} else { } else {
if ok, qualifier := nameFn(meta.Name, false); !ok { if ok, qualifier := nameFn(meta.Name, false); !ok {
allErrs = append(allErrs, errs.NewFieldInvalid("name", meta.Name, qualifier)) allErrs = append(allErrs, errs.NewFieldInvalid("name", meta.Name, qualifier))

14
pkg/api/validation/validation_test.go
View File

@ -2245,7 +2245,7 @@ func TestValidateReplicationController(t *testing.T) {
for i := range errs { for i := range errs {
field := errs[i].(*errors.ValidationError).Field field := errs[i].(*errors.ValidationError).Field
if !strings.HasPrefix(field, "spec.template.") && if !strings.HasPrefix(field, "spec.template.") &&
field != "metadata.name" && field != "metadata.name or metadata.generateName" &&
field != "metadata.namespace" && field != "metadata.namespace" &&
field != "spec.selector" && field != "spec.selector" &&
field != "spec.template" && field != "spec.template" &&
@ -2360,11 +2360,11 @@ func TestValidateNode(t *testing.T) {
for i := range errs { for i := range errs {
field := errs[i].(*errors.ValidationError).Field field := errs[i].(*errors.ValidationError).Field
expectedFields := map[string]bool{ expectedFields := map[string]bool{
"metadata.name": true, "metadata.name or metadata.generateName": true,
"metadata.labels": true, "metadata.labels": true,
"metadata.annotations": true, "metadata.annotations": true,
"metadata.namespace": true, "metadata.namespace": true,
"spec.ExternalID": true, "spec.ExternalID": true,
} }
if expectedFields[field] == false { if expectedFields[field] == false {
t.Errorf("%s: missing prefix for: %v", k, errs[i]) t.Errorf("%s: missing prefix for: %v", k, errs[i])
@ -2894,7 +2894,7 @@ func TestValidateResourceQuota(t *testing.T) {
for i := range errs { for i := range errs {
field := errs[i].(*errors.ValidationError).Field field := errs[i].(*errors.ValidationError).Field
detail := errs[i].(*errors.ValidationError).Detail detail := errs[i].(*errors.ValidationError).Detail
if field != "metadata.name" && field != "metadata.namespace" { if field != "metadata.name" && field != "metadata.name or metadata.generateName" && field != "metadata.namespace" {
t.Errorf("%s: missing prefix for: %v", k, field) t.Errorf("%s: missing prefix for: %v", k, field)
} }
if detail != v.D { if detail != v.D {

7
pkg/util/fielderrors/fielderrors.go
View File

@ -148,6 +148,7 @@ func NewFieldTooLong(field string, value interface{}, maxLength int) *Validation
type ValidationErrorList []error type ValidationErrorList []error
// Prefix adds a prefix to the Field of every ValidationError in the list. // Prefix adds a prefix to the Field of every ValidationError in the list.
// Also adds prefixes to multiple fields if you send an or seperator.
// Returns the list for convenience. // Returns the list for convenience.
func (list ValidationErrorList) Prefix(prefix string) ValidationErrorList { func (list ValidationErrorList) Prefix(prefix string) ValidationErrorList {
for i := range list { for i := range list {
@ -155,7 +156,11 @@ func (list ValidationErrorList) Prefix(prefix string) ValidationErrorList {
if strings.HasPrefix(err.Field, "[") { if strings.HasPrefix(err.Field, "[") {
err.Field = prefix + err.Field err.Field = prefix + err.Field
} else if len(err.Field) != 0 { } else if len(err.Field) != 0 {
err.Field = prefix + "." + err.Field fields := strings.SplitAfter(err.Field, " or ")
err.Field = ""
for j := range fields {
err.Field += prefix + "." + fields[j]
}
} else { } else {
err.Field = prefix err.Field = prefix
} }