From f97cdeb4190284e87879a36db520badee0819045 Mon Sep 17 00:00:00 2001 From: mango Date: Wed, 16 Feb 2022 14:02:11 +0800 Subject: [PATCH] refactor: Change the users of IsQualifiedName to ValidateQualifiedName --- .../validation/validation.go | 8 ++----- pkg/apis/core/validation/events.go | 4 +--- pkg/apis/core/validation/validation.go | 24 +++++-------------- 3 files changed, 9 insertions(+), 27 deletions(-) diff --git a/pkg/apis/apiserverinternal/validation/validation.go b/pkg/apis/apiserverinternal/validation/validation.go index 7085c30cc1e..4493907d1cc 100644 --- a/pkg/apis/apiserverinternal/validation/validation.go +++ b/pkg/apis/apiserverinternal/validation/validation.go @@ -142,12 +142,8 @@ func validateStorageVersionCondition(conditions []apiserverinternal.StorageVersi fmt.Sprintf("the type of the condition is not unique, it also appears in conditions[%d]", ii))) } seenType[condition.Type] = i - for _, msg := range utilvalidation.IsQualifiedName(string(condition.Type)) { - allErrs = append(allErrs, field.Invalid(fldPath.Index(i).Child("type"), string(condition.Type), msg)) - } - for _, msg := range utilvalidation.IsQualifiedName(string(condition.Status)) { - allErrs = append(allErrs, field.Invalid(fldPath.Index(i).Child("status"), string(condition.Type), msg)) - } + allErrs = append(allErrs, apivalidation.ValidateQualifiedName(string(condition.Type), fldPath.Index(i).Child("type"))...) + allErrs = append(allErrs, apivalidation.ValidateQualifiedName(string(condition.Status), fldPath.Index(i).Child("status"))...) if condition.Reason == "" { allErrs = append(allErrs, field.Required(fldPath.Index(i).Child("reason"), "reason cannot be empty")) } diff --git a/pkg/apis/core/validation/events.go b/pkg/apis/core/validation/events.go index adb0177b7a5..ca7b88b640e 100644 --- a/pkg/apis/core/validation/events.go +++ b/pkg/apis/core/validation/events.go @@ -146,9 +146,7 @@ func legacyValidateEvent(event *core.Event) field.ErrorList { if len(event.ReportingController) == 0 { allErrs = append(allErrs, field.Required(field.NewPath("reportingController"), "")) } - for _, msg := range validation.IsQualifiedName(event.ReportingController) { - allErrs = append(allErrs, field.Invalid(field.NewPath("reportingController"), event.ReportingController, msg)) - } + allErrs = append(allErrs, ValidateQualifiedName(event.ReportingController, field.NewPath("reportingController"))...) if len(event.ReportingInstance) == 0 { allErrs = append(allErrs, field.Required(field.NewPath("reportingInstance"), "")) } diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go index ed7d0ec85c6..b1078919f85 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -2422,13 +2422,9 @@ func validateObjectFieldSelector(fs *core.ObjectFieldSelector, expressions *sets if path, subscript, ok := fieldpath.SplitMaybeSubscriptedPath(internalFieldPath); ok { switch path { case "metadata.annotations": - for _, msg := range validation.IsQualifiedName(strings.ToLower(subscript)) { - allErrs = append(allErrs, field.Invalid(fldPath, subscript, msg)) - } + allErrs = append(allErrs, ValidateQualifiedName(strings.ToLower(subscript), fldPath)...) case "metadata.labels": - for _, msg := range validation.IsQualifiedName(subscript) { - allErrs = append(allErrs, field.Invalid(fldPath, subscript, msg)) - } + allErrs = append(allErrs, ValidateQualifiedName(subscript, fldPath)...) default: allErrs = append(allErrs, field.Invalid(fldPath, path, "does not support subscript")) } @@ -3192,9 +3188,7 @@ const ( func validateReadinessGates(readinessGates []core.PodReadinessGate, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} for i, value := range readinessGates { - for _, msg := range validation.IsQualifiedName(string(value.ConditionType)) { - allErrs = append(allErrs, field.Invalid(fldPath.Index(i).Child("conditionType"), string(value.ConditionType), msg)) - } + allErrs = append(allErrs, ValidateQualifiedName(string(value.ConditionType), fldPath.Index(i).Child("conditionType"))...) } return allErrs } @@ -4442,9 +4436,7 @@ func validatePodConditions(conditions []core.PodCondition, fldPath *field.Path) if systemConditions.Has(string(condition.Type)) { continue } - for _, msg := range validation.IsQualifiedName(string(condition.Type)) { - allErrs = append(allErrs, field.Invalid(fldPath.Index(i).Child("Type"), string(condition.Type), msg)) - } + allErrs = append(allErrs, ValidateQualifiedName(string(condition.Type), fldPath.Index(i).Child("Type"))...) } return allErrs } @@ -4726,9 +4718,7 @@ func validateServicePort(sp *core.ServicePort, requireName, isHeadlessService bo allErrs = append(allErrs, ValidatePortNumOrName(sp.TargetPort, fldPath.Child("targetPort"))...) if sp.AppProtocol != nil { - for _, msg := range validation.IsQualifiedName(*sp.AppProtocol) { - allErrs = append(allErrs, field.Invalid(fldPath.Child("appProtocol"), sp.AppProtocol, msg)) - } + allErrs = append(allErrs, ValidateQualifiedName(*sp.AppProtocol, fldPath.Child("appProtocol"))...) } // in the v1 API, targetPorts on headless services were tolerated. @@ -6133,9 +6123,7 @@ func validateEndpointPort(port *core.EndpointPort, requireName bool, fldPath *fi allErrs = append(allErrs, field.NotSupported(fldPath.Child("protocol"), port.Protocol, supportedPortProtocols.List())) } if port.AppProtocol != nil { - for _, msg := range validation.IsQualifiedName(*port.AppProtocol) { - allErrs = append(allErrs, field.Invalid(fldPath.Child("appProtocol"), port.AppProtocol, msg)) - } + allErrs = append(allErrs, ValidateQualifiedName(*port.AppProtocol, fldPath.Child("appProtocol"))...) } return allErrs }