Merge pull request kubernetes#71176 from idealhack/fix-unreachable-code-and-golint-warnings

Fix go vet and golint warnings

Author: k8s-ci-robot

hack/.golint_failures

@@ -515,7 +515,6 @@ staging/src/k8s.io/apimachinery/pkg/util/runtime
 staging/src/k8s.io/apimachinery/pkg/util/sets/types
 staging/src/k8s.io/apimachinery/pkg/util/strategicpatch
 staging/src/k8s.io/apimachinery/pkg/util/uuid
-staging/src/k8s.io/apimachinery/pkg/util/validation
 staging/src/k8s.io/apimachinery/pkg/util/wait
 staging/src/k8s.io/apimachinery/pkg/util/yaml
 staging/src/k8s.io/apimachinery/pkg/watch

staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch_test.go

@@ -282,7 +282,7 @@ testCases:
 
 func TestSortMergeLists(t *testing.T) {
 	mergeItemOpenapiSchema := PatchMetaFromOpenAPI{
-		Schema: sptest.GetSchemaOrDie(fakeMergeItemSchema, "mergeItem"),
+		Schema: sptest.GetSchemaOrDie(&fakeMergeItemSchema, "mergeItem"),
 	}
 	schemas := []LookupPatchMeta{
 		mergeItemStructSchema,
@@ -673,7 +673,7 @@ mergingList:
 
 func TestCustomStrategicMergePatch(t *testing.T) {
 	mergeItemOpenapiSchema := PatchMetaFromOpenAPI{
-		Schema: sptest.GetSchemaOrDie(fakeMergeItemSchema, "mergeItem"),
+		Schema: sptest.GetSchemaOrDie(&fakeMergeItemSchema, "mergeItem"),
 	}
 	schemas := []LookupPatchMeta{
 		mergeItemStructSchema,
@@ -6029,7 +6029,7 @@ func TestStrategicMergePatch(t *testing.T) {
 		"{}", "{}", []byte("<THIS IS NOT A STRUCT>"), mergepatch.ErrBadArgKind(struct{}{}, []byte{}))
 
 	mergeItemOpenapiSchema := PatchMetaFromOpenAPI{
-		Schema: sptest.GetSchemaOrDie(fakeMergeItemSchema, "mergeItem"),
+		Schema: sptest.GetSchemaOrDie(&fakeMergeItemSchema, "mergeItem"),
 	}
 	schemas := []LookupPatchMeta{
 		mergeItemStructSchema,
@@ -6413,7 +6413,7 @@ func TestNumberConversion(t *testing.T) {
 	}
 
 	precisionItemOpenapiSchema := PatchMetaFromOpenAPI{
-		Schema: sptest.GetSchemaOrDie(fakePrecisionItemSchema, "precisionItem"),
+		Schema: sptest.GetSchemaOrDie(&fakePrecisionItemSchema, "precisionItem"),
 	}
 	precisionItemSchemas := []LookupPatchMeta{
 		precisionItemStructSchema,
@@ -6623,7 +6623,7 @@ replacingItem:
 
 func TestReplaceWithRawExtension(t *testing.T) {
 	mergeItemOpenapiSchema := PatchMetaFromOpenAPI{
-		Schema: sptest.GetSchemaOrDie(fakeMergeItemSchema, "mergeItem"),
+		Schema: sptest.GetSchemaOrDie(&fakeMergeItemSchema, "mergeItem"),
 	}
 	schemas := []LookupPatchMeta{
 		mergeItemStructSchema,
@@ -6695,7 +6695,7 @@ func TestUnknownField(t *testing.T) {
 	}
 
 	mergeItemOpenapiSchema := PatchMetaFromOpenAPI{
-		Schema: sptest.GetSchemaOrDie(fakeMergeItemSchema, "mergeItem"),
+		Schema: sptest.GetSchemaOrDie(&fakeMergeItemSchema, "mergeItem"),
 	}
 	schemas := []LookupPatchMeta{
 		mergeItemStructSchema,

staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testing/openapi.go

@@ -62,7 +62,7 @@ func (f *Fake) OpenAPISchema() (*openapi_v2.Document, error) {
 	return f.document, f.err
 }
 
-func getSchema(f Fake, model string) (openapi.Schema, error) {
+func getSchema(f *Fake, model string) (openapi.Schema, error) {
 	s, err := f.OpenAPISchema()
 	if err != nil {
 		return nil, err
@@ -75,7 +75,7 @@ func getSchema(f Fake, model string) (openapi.Schema, error) {
 }
 
 // GetSchemaOrDie returns the openapi schema.
-func GetSchemaOrDie(f Fake, model string) openapi.Schema {
+func GetSchemaOrDie(f *Fake, model string) openapi.Schema {
 	s, err := getSchema(f, model)
 	if err != nil {
 		panic(err)

staging/src/k8s.io/apimachinery/pkg/util/validation/validation.go

@@ -87,6 +87,8 @@ func IsFullyQualifiedName(fldPath *field.Path, name string) field.ErrorList {
 
 const labelValueFmt string = "(" + qualifiedNameFmt + ")?"
 const labelValueErrMsg string = "a valid label must be an empty string or consist of alphanumeric characters, '-', '_' or '.', and must start and end with an alphanumeric character"
+
+// LabelValueMaxLength is a label's max length
 const LabelValueMaxLength int = 63
 
 var labelValueRegexp = regexp.MustCompile("^" + labelValueFmt + "$")
@@ -107,6 +109,8 @@ func IsValidLabelValue(value string) []string {
 
 const dns1123LabelFmt string = "[a-z0-9]([-a-z0-9]*[a-z0-9])?"
 const dns1123LabelErrMsg string = "a DNS-1123 label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character"
+
+// DNS1123LabelMaxLength is a label's max length in DNS (RFC 1123)
 const DNS1123LabelMaxLength int = 63
 
 var dns1123LabelRegexp = regexp.MustCompile("^" + dns1123LabelFmt + "$")
@@ -126,6 +130,8 @@ func IsDNS1123Label(value string) []string {
 
 const dns1123SubdomainFmt string = dns1123LabelFmt + "(\\." + dns1123LabelFmt + ")*"
 const dns1123SubdomainErrorMsg string = "a DNS-1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character"
+
+// DNS1123SubdomainMaxLength is a subdomain's max length in DNS (RFC 1123)
 const DNS1123SubdomainMaxLength int = 253
 
 var dns1123SubdomainRegexp = regexp.MustCompile("^" + dns1123SubdomainFmt + "$")
@@ -145,6 +151,8 @@ func IsDNS1123Subdomain(value string) []string {
 
 const dns1035LabelFmt string = "[a-z]([-a-z0-9]*[a-z0-9])?"
 const dns1035LabelErrMsg string = "a DNS-1035 label must consist of lower case alphanumeric characters or '-', start with an alphabetic character, and end with an alphanumeric character"
+
+// DNS1035LabelMaxLength is a label's max length in DNS (RFC 1035)
 const DNS1035LabelMaxLength int = 63
 
 var dns1035LabelRegexp = regexp.MustCompile("^" + dns1035LabelFmt + "$")
@@ -282,6 +290,7 @@ const percentErrMsg string = "a valid percent string must be a numeric string fo
 
 var percentRegexp = regexp.MustCompile("^" + percentFmt + "$")
 
+// IsValidPercent checks that string is in the form of a percentage
 func IsValidPercent(percent string) []string {
 	if !percentRegexp.MatchString(percent) {
 		return []string{RegexError(percentErrMsg, percentFmt, "1%", "93%")}
@@ -391,13 +400,13 @@ func hasChDirPrefix(value string) []string {
 	return errs
 }
 
-// IsSocketAddr checks that a string conforms is a valid socket address
+// IsValidSocketAddr checks that string represents a valid socket address
 // as defined in RFC 789. (e.g 0.0.0.0:10254 or [::]:10254))
 func IsValidSocketAddr(value string) []string {
 	var errs []string
 	ip, port, err := net.SplitHostPort(value)
 	if err != nil {
-		return append(errs, "must be a valid socket address format, (e.g. 0.0.0.0:10254 or [::]:10254)")
+		errs = append(errs, "must be a valid socket address format, (e.g. 0.0.0.0:10254 or [::]:10254)")
 		return errs
 	}
 	portInt, _ := strconv.Atoi(port)

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go

@@ -884,7 +884,6 @@ func TestFinishRequest(t *testing.T) {
 			timeout: time.Second,
 			fn: func() (runtime.Object, error) {
 				panic("my panic")
-				return nil, nil
 			},
 			expectedObj:   nil,
 			expectedErr:   nil,
@@ -895,7 +894,6 @@ func TestFinishRequest(t *testing.T) {
 			timeout: time.Second,
 			fn: func() (runtime.Object, error) {
 				panic("my panic")
-				return nil, nil
 			},
 			expectedObj:   nil,
 			expectedErr:   nil,