From 4a39b32fb078521fd8d62a4bff625e8e2bafc0f5 Mon Sep 17 00:00:00 2001
From: RainbowMango <renhongcai@huawei.com>
Date: Wed, 21 Aug 2019 14:40:05 +0800
Subject: [PATCH] Fix static failure for package:
 staging/src/k8s.io/code-generator

---
 hack/.staticcheck_failures                                 | 3 ---
 .../generators/fake/generator_fake_for_clientset.go        | 7 -------
 .../code-generator/cmd/client-gen/generators/util/tags.go  | 2 +-
 .../code-generator/cmd/go-to-protobuf/protobuf/cmd.go      | 6 +++---
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
index c1b0e8f22ae..c4d5363d8a4 100644
--- a/hack/.staticcheck_failures
+++ b/hack/.staticcheck_failures
@@ -210,9 +210,6 @@ vendor/k8s.io/client-go/rest/watch
 vendor/k8s.io/client-go/restmapper
 vendor/k8s.io/client-go/tools/leaderelection
 vendor/k8s.io/client-go/transport
-vendor/k8s.io/code-generator/cmd/client-gen/generators/fake
-vendor/k8s.io/code-generator/cmd/client-gen/generators/util
-vendor/k8s.io/code-generator/cmd/go-to-protobuf/protobuf
 vendor/k8s.io/component-base/metrics
 vendor/k8s.io/kubectl/pkg/cmd/annotate
 vendor/k8s.io/kubectl/pkg/cmd/certificates
diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
index 55709aab2e5..d23b8005f3e 100644
--- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
+++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
@@ -165,10 +165,3 @@ func (c *Clientset) $.GroupGoName$$.Version$() $.PackageAlias$.$.GroupGoName$$.V
 	return &fake$.PackageAlias$.Fake$.GroupGoName$$.Version${Fake: &c.Fake}
 }
 `
-
-var clientsetInterfaceDefaultVersionImpl = `
-// $.GroupGoName$ retrieves the $.GroupGoName$$.Version$Client
-func (c *Clientset) $.GroupGoName$() $.PackageAlias$.$.GroupGoName$$.Version$Interface {
-	return &fake$.PackageAlias$.Fake$.GroupGoName$$.Version${Fake: &c.Fake}
-}
-`
diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/util/tags.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/util/tags.go
index 0b7d68ca880..426b3927311 100644
--- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/util/tags.go
+++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/util/tags.go
@@ -190,7 +190,7 @@ func MustParseClientGenTags(lines []string) Tags {
 func ParseClientGenTags(lines []string) (Tags, error) {
 	ret := Tags{}
 	values := types.ExtractCommentTags("+", lines)
-	value := []string{}
+	var value []string
 	value, ret.GenerateClient = values["genclient"]
 	// Check the old format and error when used to avoid generating client when //+genclient=false
 	if len(value) > 0 && len(value[0]) > 0 {
diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go
index e85ceb8d175..8a7be5260c7 100644
--- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go
+++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go
@@ -279,7 +279,7 @@ func Run(g *Generator) {
 		cmd := exec.Command("protoc", append(args, path)...)
 		out, err := cmd.CombinedOutput()
 		if len(out) > 0 {
-			log.Printf(string(out))
+			log.Print(string(out))
 		}
 		if err != nil {
 			log.Println(strings.Join(cmd.Args, " "))
@@ -300,7 +300,7 @@ func Run(g *Generator) {
 		cmd = exec.Command("goimports", "-w", outputPath)
 		out, err = cmd.CombinedOutput()
 		if len(out) > 0 {
-			log.Printf(string(out))
+			log.Print(string(out))
 		}
 		if err != nil {
 			log.Println(strings.Join(cmd.Args, " "))
@@ -311,7 +311,7 @@ func Run(g *Generator) {
 		cmd = exec.Command("gofmt", "-s", "-w", outputPath)
 		out, err = cmd.CombinedOutput()
 		if len(out) > 0 {
-			log.Printf(string(out))
+			log.Print(string(out))
 		}
 		if err != nil {
 			log.Println(strings.Join(cmd.Args, " "))