github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108150 from mangoGoForward/refactor/change-isqualifiedname-to-validatequalifiedname

Browse Source 
refactor: Change the uses of IsQualifiedName to ValidateQualifiedName
This commit is contained in:
Kubernetes Prow Robot 2022-05-03 17:18:55 -07:00 committed by GitHub
commit c0ec0c2a31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/apis/apiserverinternal/validation/validation.go
View File

@ -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))) fmt.Sprintf("the type of the condition is not unique, it also appears in conditions[%d]", ii)))
} }
seenType[condition.Type] = i seenType[condition.Type] = i
for _, msg := range utilvalidation.IsQualifiedName(string(condition.Type)) { allErrs = append(allErrs, apivalidation.ValidateQualifiedName(string(condition.Type), fldPath.Index(i).Child("type"))...)
allErrs = append(allErrs, field.Invalid(fldPath.Index(i).Child("type"), string(condition.Type), msg)) allErrs = append(allErrs, apivalidation.ValidateQualifiedName(string(condition.Status), fldPath.Index(i).Child("status"))...)
}
for _, msg := range utilvalidation.IsQualifiedName(string(condition.Status)) {
allErrs = append(allErrs, field.Invalid(fldPath.Index(i).Child("status"), string(condition.Type), msg))
}
if condition.Reason == "" { if condition.Reason == "" {
allErrs = append(allErrs, field.Required(fldPath.Index(i).Child("reason"), "reason cannot be empty")) allErrs = append(allErrs, field.Required(fldPath.Index(i).Child("reason"), "reason cannot be empty"))
} }

4
pkg/apis/core/validation/events.go
View File

@ -146,9 +146,7 @@ func legacyValidateEvent(event *core.Event) field.ErrorList {
if len(event.ReportingController) == 0 { if len(event.ReportingController) == 0 {
allErrs = append(allErrs, field.Required(field.NewPath("reportingController"), "")) allErrs = append(allErrs, field.Required(field.NewPath("reportingController"), ""))
} }
for _, msg := range validation.IsQualifiedName(event.ReportingController) { allErrs = append(allErrs, ValidateQualifiedName(event.ReportingController, field.NewPath("reportingController"))...)
allErrs = append(allErrs, field.Invalid(field.NewPath("reportingController"), event.ReportingController, msg))
}
if len(event.ReportingInstance) == 0 { if len(event.ReportingInstance) == 0 {
allErrs = append(allErrs, field.Required(field.NewPath("reportingInstance"), "")) allErrs = append(allErrs, field.Required(field.NewPath("reportingInstance"), ""))
} }

24
pkg/apis/core/validation/validation.go
View File

@ -2417,13 +2417,9 @@ func validateObjectFieldSelector(fs *core.ObjectFieldSelector, expressions *sets
if path, subscript, ok := fieldpath.SplitMaybeSubscriptedPath(internalFieldPath); ok { if path, subscript, ok := fieldpath.SplitMaybeSubscriptedPath(internalFieldPath); ok {
switch path { switch path {
case "metadata.annotations": case "metadata.annotations":
for _, msg := range validation.IsQualifiedName(strings.ToLower(subscript)) { allErrs = append(allErrs, ValidateQualifiedName(strings.ToLower(subscript), fldPath)...)
allErrs = append(allErrs, field.Invalid(fldPath, subscript, msg))
}
case "metadata.labels": case "metadata.labels":
for _, msg := range validation.IsQualifiedName(subscript) { allErrs = append(allErrs, ValidateQualifiedName(subscript, fldPath)...)
allErrs = append(allErrs, field.Invalid(fldPath, subscript, msg))
}
default: default:
allErrs = append(allErrs, field.Invalid(fldPath, path, "does not support subscript")) allErrs = append(allErrs, field.Invalid(fldPath, path, "does not support subscript"))
} }
@ -3187,9 +3183,7 @@ const (
func validateReadinessGates(readinessGates []core.PodReadinessGate, fldPath *field.Path) field.ErrorList { func validateReadinessGates(readinessGates []core.PodReadinessGate, fldPath *field.Path) field.ErrorList {
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
for i, value := range readinessGates { for i, value := range readinessGates {
for _, msg := range validation.IsQualifiedName(string(value.ConditionType)) { allErrs = append(allErrs, ValidateQualifiedName(string(value.ConditionType), fldPath.Index(i).Child("conditionType"))...)
allErrs = append(allErrs, field.Invalid(fldPath.Index(i).Child("conditionType"), string(value.ConditionType), msg))
}
} }
return allErrs return allErrs
} }
@ -4447,9 +4441,7 @@ func validatePodConditions(conditions []core.PodCondition, fldPath *field.Path)
if systemConditions.Has(string(condition.Type)) { if systemConditions.Has(string(condition.Type)) {
continue continue
} }
for _, msg := range validation.IsQualifiedName(string(condition.Type)) { allErrs = append(allErrs, ValidateQualifiedName(string(condition.Type), fldPath.Index(i).Child("Type"))...)
allErrs = append(allErrs, field.Invalid(fldPath.Index(i).Child("Type"), string(condition.Type), msg))
}
} }
return allErrs return allErrs
} }
@ -4731,9 +4723,7 @@ func validateServicePort(sp *core.ServicePort, requireName, isHeadlessService bo
allErrs = append(allErrs, ValidatePortNumOrName(sp.TargetPort, fldPath.Child("targetPort"))...) allErrs = append(allErrs, ValidatePortNumOrName(sp.TargetPort, fldPath.Child("targetPort"))...)
if sp.AppProtocol != nil { if sp.AppProtocol != nil {
for _, msg := range validation.IsQualifiedName(*sp.AppProtocol) { allErrs = append(allErrs, ValidateQualifiedName(*sp.AppProtocol, fldPath.Child("appProtocol"))...)
allErrs = append(allErrs, field.Invalid(fldPath.Child("appProtocol"), sp.AppProtocol, msg))
}
} }
// in the v1 API, targetPorts on headless services were tolerated. // in the v1 API, targetPorts on headless services were tolerated.
@ -6132,9 +6122,7 @@ func validateEndpointPort(port *core.EndpointPort, requireName bool, fldPath *fi
allErrs = append(allErrs, field.NotSupported(fldPath.Child("protocol"), port.Protocol, supportedPortProtocols.List())) allErrs = append(allErrs, field.NotSupported(fldPath.Child("protocol"), port.Protocol, supportedPortProtocols.List()))
} }
if port.AppProtocol != nil { if port.AppProtocol != nil {
for _, msg := range validation.IsQualifiedName(*port.AppProtocol) { allErrs = append(allErrs, ValidateQualifiedName(*port.AppProtocol, fldPath.Child("appProtocol"))...)
allErrs = append(allErrs, field.Invalid(fldPath.Child("appProtocol"), port.AppProtocol, msg))
}
} }
return allErrs return allErrs
} }