Skip to content

Commit 9372e80

Browse files
committed
fix: golint errors in staging/src/k8s.io/apimachinery/pkg/api/validation
Signed-off-by: QianChenglong <[email protected]>
1 parent 9d3406c commit 9372e80

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

hack/.golint_failures

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,6 @@ staging/src/k8s.io/apimachinery/pkg/api/apitesting/fuzzer
262262
staging/src/k8s.io/apimachinery/pkg/api/apitesting/roundtrip
263263
staging/src/k8s.io/apimachinery/pkg/api/meta
264264
staging/src/k8s.io/apimachinery/pkg/api/resource
265-
staging/src/k8s.io/apimachinery/pkg/api/validation
266-
staging/src/k8s.io/apimachinery/pkg/api/validation/path
267265
staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer
268266
staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion
269267
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1

staging/src/k8s.io/apimachinery/pkg/api/validation/generic.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"k8s.io/apimachinery/pkg/util/validation/field"
2424
)
2525

26+
// IsNegativeErrorMsg is a error message for value must be greater than or equal to 0.
2627
const IsNegativeErrorMsg string = `must be greater than or equal to 0`
2728

2829
// ValidateNameFunc validates that the provided name is valid for a given resource type.
@@ -75,7 +76,7 @@ func maskTrailingDash(name string) string {
7576
return name
7677
}
7778

78-
// Validates that given value is not negative.
79+
// ValidateNonnegativeField validates that given value is not negative.
7980
func ValidateNonnegativeField(value int64, fldPath *field.Path) field.ErrorList {
8081
allErrs := field.ErrorList{}
8182
if value < 0 {

staging/src/k8s.io/apimachinery/pkg/api/validation/objectmeta.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"k8s.io/apimachinery/pkg/util/validation/field"
3131
)
3232

33+
// FieldImmutableErrorMsg is a error message for field is immutable.
3334
const FieldImmutableErrorMsg string = `field is immutable`
3435

3536
const totalAnnotationSizeLimitB int = 256 * (1 << 10) // 256 kB
@@ -80,6 +81,7 @@ func validateOwnerReference(ownerReference metav1.OwnerReference, fldPath *field
8081
return allErrs
8182
}
8283

84+
// ValidateOwnerReferences validates that a set of owner references are correctly defined.
8385
func ValidateOwnerReferences(ownerReferences []metav1.OwnerReference, fldPath *field.Path) field.ErrorList {
8486
allErrs := field.ErrorList{}
8587
controllerName := ""
@@ -97,7 +99,7 @@ func ValidateOwnerReferences(ownerReferences []metav1.OwnerReference, fldPath *f
9799
return allErrs
98100
}
99101

100-
// Validate finalizer names
102+
// ValidateFinalizerName validates finalizer names.
101103
func ValidateFinalizerName(stringValue string, fldPath *field.Path) field.ErrorList {
102104
allErrs := field.ErrorList{}
103105
for _, msg := range validation.IsQualifiedName(stringValue) {
@@ -107,6 +109,7 @@ func ValidateFinalizerName(stringValue string, fldPath *field.Path) field.ErrorL
107109
return allErrs
108110
}
109111

112+
// ValidateNoNewFinalizers validates the new finalizers has no new finalizers compare to old finalizers.
110113
func ValidateNoNewFinalizers(newFinalizers []string, oldFinalizers []string, fldPath *field.Path) field.ErrorList {
111114
allErrs := field.ErrorList{}
112115
extra := sets.NewString(newFinalizers...).Difference(sets.NewString(oldFinalizers...))
@@ -116,6 +119,7 @@ func ValidateNoNewFinalizers(newFinalizers []string, oldFinalizers []string, fld
116119
return allErrs
117120
}
118121

122+
// ValidateImmutableField validates the new value and the old value are deeply equal.
119123
func ValidateImmutableField(newVal, oldVal interface{}, fldPath *field.Path) field.ErrorList {
120124
allErrs := field.ErrorList{}
121125
if !apiequality.Semantic.DeepEqual(oldVal, newVal) {
@@ -137,7 +141,7 @@ func ValidateObjectMeta(objMeta *metav1.ObjectMeta, requiresNamespace bool, name
137141
return ValidateObjectMetaAccessor(metadata, requiresNamespace, nameFn, fldPath)
138142
}
139143

140-
// ValidateObjectMeta validates an object's metadata on creation. It expects that name generation has already
144+
// ValidateObjectMetaAccessor validates an object's metadata on creation. It expects that name generation has already
141145
// been performed.
142146
// It doesn't return an error for rootscoped resources with namespace, because namespace should already be cleared before.
143147
func ValidateObjectMetaAccessor(meta metav1.Object, requiresNamespace bool, nameFn ValidateNameFunc, fldPath *field.Path) field.ErrorList {
@@ -208,7 +212,7 @@ func ValidateFinalizers(finalizers []string, fldPath *field.Path) field.ErrorLis
208212
return allErrs
209213
}
210214

211-
// ValidateObjectMetaUpdate validates an object's metadata when updated
215+
// ValidateObjectMetaUpdate validates an object's metadata when updated.
212216
func ValidateObjectMetaUpdate(newMeta, oldMeta *metav1.ObjectMeta, fldPath *field.Path) field.ErrorList {
213217
newMetadata, err := meta.Accessor(newMeta)
214218
if err != nil {
@@ -225,6 +229,7 @@ func ValidateObjectMetaUpdate(newMeta, oldMeta *metav1.ObjectMeta, fldPath *fiel
225229
return ValidateObjectMetaAccessorUpdate(newMetadata, oldMetadata, fldPath)
226230
}
227231

232+
// ValidateObjectMetaAccessorUpdate validates an object's metadata when updated.
228233
func ValidateObjectMetaAccessorUpdate(newMeta, oldMeta metav1.Object, fldPath *field.Path) field.ErrorList {
229234
var allErrs field.ErrorList
230235

staging/src/k8s.io/apimachinery/pkg/api/validation/path/name.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func IsValidPathSegmentPrefix(name string) []string {
6262
func ValidatePathSegmentName(name string, prefix bool) []string {
6363
if prefix {
6464
return IsValidPathSegmentPrefix(name)
65-
} else {
66-
return IsValidPathSegmentName(name)
6765
}
66+
67+
return IsValidPathSegmentName(name)
6868
}

0 commit comments

Comments
 (0)