Merge pull request #69491 from chrischdi/lint-pkg-util-strings

hack/.golint_failures

@@ -397,7 +397,6 @@ pkg/util/removeall
 pkg/util/resourcecontainer
 pkg/util/rlimit
 pkg/util/selinux
-pkg/util/strings
 pkg/util/sysctl
 pkg/util/sysctl/testing
 pkg/util/system

pkg/util/strings/strings.go

@@ -22,7 +22,7 @@ import (
 	"unicode"
 )
 
-// Splits a fully qualified name and returns its namespace and name.
+// SplitQualifiedName Splits a fully qualified name and returns its namespace and name.
 // Assumes that the input 'str' has been validated.
 func SplitQualifiedName(str string) (string, string) {
 	parts := strings.Split(str, "/")
@@ -32,19 +32,18 @@ func SplitQualifiedName(str string) (string, string) {
 	return parts[0], parts[1]
 }
 
-// Joins 'namespace' and 'name' and returns a fully qualified name
+// JoinQualifiedName joins 'namespace' and 'name' and returns a fully qualified name
 // Assumes that the input is valid.
 func JoinQualifiedName(namespace, name string) string {
 	return path.Join(namespace, name)
 }
 
-// Returns the first N slice of a string.
+// ShortenString returns the first N slice of a string.
 func ShortenString(str string, n int) string {
 	if len(str) <= n {
 		return str
-	} else {
-		return str[:n]
 	}
+	return str[:n]
 }
 
 // isVowel returns true if the rune is a vowel (case insensitive).

pkg/util/strings/strings_test.go

@@ -56,16 +56,16 @@ func TestJoinQualifiedName(t *testing.T) {
 
 func TestShortenString(t *testing.T) {
 	testCases := []struct {
-		input   string
-		out_len int
-		output  string
+		input  string
+		outLen int
+		output string
 	}{
 		{"kubernetes.io", 5, "kuber"},
 		{"blah", 34, "blah"},
 		{"kubernetes.io", 13, "kubernetes.io"},
 	}
 	for i, tc := range testCases {
-		res := ShortenString(tc.input, tc.out_len)
+		res := ShortenString(tc.input, tc.outLen)
 		if res != tc.output {
 			t.Errorf("case[%d]: expected %q, got %q", i, tc.output, res)
 		}