Skip to content

Commit 443dfbe

Browse files
authored
Merge pull request #10227 from k8s-infra-cherrypick-robot/cherry-pick-10128-to-release-1.8
[release-1.8] Fix golang-ci linter errors
2 parents fed3e04 + 1d8e7f4 commit 443dfbe

File tree

37 files changed

+205
-161
lines changed

37 files changed

+205
-161
lines changed

cmd/dataplane/main.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,10 @@ package main
1818

1919
import (
2020
"fmt"
21-
"math/rand" // #nosec
22-
"net/http"
23-
"os"
24-
"time"
25-
2621
"github.com/prometheus/client_golang/prometheus"
2722
"github.com/prometheus/client_golang/prometheus/collectors"
23+
"net/http"
24+
"os"
2825

2926
"k8s.io/klog/v2"
3027

@@ -41,8 +38,6 @@ import (
4138
func main() {
4239
klog.InitFlags(nil)
4340

44-
rand.Seed(time.Now().UnixNano())
45-
4641
fmt.Println(version.String())
4742
var err error
4843
showVersion, conf, err := ingressflags.ParseFlags()

cmd/nginx/main.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package main
1919
import (
2020
"context"
2121
"fmt"
22-
"math/rand" // #nosec
2322
"net/http"
2423
"os"
2524
"path/filepath"
@@ -54,8 +53,6 @@ import (
5453
func main() {
5554
klog.InitFlags(nil)
5655

57-
rand.Seed(time.Now().UnixNano())
58-
5956
fmt.Println(version.String())
6057

6158
showVersion, conf, err := ingressflags.ParseFlags()

cmd/plugin/commands/certs/certs.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package certs
1818

1919
import (
2020
"fmt"
21+
"os"
2122

2223
"github.com/spf13/cobra"
2324

@@ -46,7 +47,10 @@ func CreateCommand(flags *genericclioptions.ConfigFlags) *cobra.Command {
4647
}
4748

4849
cmd.Flags().String("host", "", "Get the cert for this hostname")
49-
cobra.MarkFlagRequired(cmd.Flags(), "host")
50+
if err := cobra.MarkFlagRequired(cmd.Flags(), "host"); err != nil {
51+
util.PrintError(err)
52+
os.Exit(1)
53+
}
5054
pod = util.AddPodFlag(cmd)
5155
deployment = util.AddDeploymentFlag(cmd)
5256
selector = util.AddSelectorFlag(cmd)

cmd/plugin/kubectl/kubectl.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ func execToWriter(args []string, writer io.Writer) error {
7777
return err
7878
}
7979

80-
go io.Copy(writer, op)
80+
go func() {
81+
io.Copy(writer, op) //nolint:errcheck
82+
}()
8183
err = cmd.Run()
8284
if err != nil {
8385
return err

images/fastcgi-helloserver/rootfs/main.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,7 @@ func main() {
2626
if err != nil {
2727
panic(err)
2828
}
29-
fcgi.Serve(l, nil)
29+
if err := fcgi.Serve(l, nil); err != nil {
30+
panic(err)
31+
}
3032
}

images/kube-webhook-certgen/rootfs/pkg/k8s/k8s_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package k8s
33
import (
44
"bytes"
55
"context"
6+
"crypto/rand"
67
"errors"
7-
"math/rand"
88
"testing"
99
"time"
1010

internal/admission/controller/main_test.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func TestHandleAdmission(t *testing.T) {
6767
Checker: failTestChecker{t: t},
6868
}
6969

70-
result, err := adm.HandleAdmission(&admissionv1.AdmissionReview{
70+
_, err := adm.HandleAdmission(&admissionv1.AdmissionReview{
7171
Request: &admissionv1.AdmissionRequest{
7272
Kind: v1.GroupVersionKind{Group: "", Version: "v1", Kind: "Pod"},
7373
},
@@ -76,12 +76,12 @@ func TestHandleAdmission(t *testing.T) {
7676
t.Fatalf("with a non ingress resource, the check should not pass")
7777
}
7878

79-
result, err = adm.HandleAdmission(nil)
79+
_, err = adm.HandleAdmission(nil)
8080
if err == nil {
8181
t.Fatalf("with a nil AdmissionReview request, the check should not pass")
8282
}
8383

84-
result, err = adm.HandleAdmission(&admissionv1.AdmissionReview{
84+
result, err := adm.HandleAdmission(&admissionv1.AdmissionReview{
8585
Request: &admissionv1.AdmissionRequest{
8686
Kind: v1.GroupVersionKind{Group: networking.GroupName, Version: "v1", Kind: "Ingress"},
8787
Object: runtime.RawExtension{
@@ -114,7 +114,9 @@ func TestHandleAdmission(t *testing.T) {
114114
err: fmt.Errorf("this is a test error"),
115115
}
116116

117-
adm.HandleAdmission(review)
117+
if _, err := adm.HandleAdmission(review); err != nil {
118+
t.Errorf("unexpected error: %v", err)
119+
}
118120
if review.Response.Allowed {
119121
t.Fatalf("when the checker returns an error, the request should not be allowed")
120122
}
@@ -124,7 +126,9 @@ func TestHandleAdmission(t *testing.T) {
124126
err: nil,
125127
}
126128

127-
adm.HandleAdmission(review)
129+
if _, err := adm.HandleAdmission(review); err != nil {
130+
t.Errorf("unexpected error: %v", err)
131+
}
128132
if !review.Response.Allowed {
129133
t.Fatalf("when the checker returns no error, the request should be allowed")
130134
}

internal/admission/controller/server.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ var (
3131
)
3232

3333
func init() {
34-
admissionv1.AddToScheme(scheme)
34+
if err := admissionv1.AddToScheme(scheme); err != nil {
35+
klog.ErrorS(err, "Failed to add scheme")
36+
}
3537
}
3638

3739
// AdmissionController checks if an object

internal/ingress/controller/checker_test.go

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ func TestNginxCheck(t *testing.T) {
7676
})
7777

7878
// create pid file
79-
os.MkdirAll("/tmp/nginx", file.ReadWriteByUser)
79+
if err := os.MkdirAll("/tmp/nginx", file.ReadWriteByUser); err != nil {
80+
t.Errorf("unexpected error creating pid file: %v", err)
81+
}
82+
8083
pidFile, err := os.Create(nginx.PID)
8184
if err != nil {
8285
t.Fatalf("unexpected error: %v", err)
@@ -90,14 +93,23 @@ func TestNginxCheck(t *testing.T) {
9093

9194
// start dummy process to use the PID
9295
cmd := exec.Command("sleep", "3600")
93-
cmd.Start()
96+
if err := cmd.Start(); err != nil {
97+
t.Errorf("unexpected error: %v", err)
98+
}
9499
pid := cmd.Process.Pid
95-
defer cmd.Process.Kill()
100+
defer func() {
101+
if err := cmd.Process.Kill(); err != nil {
102+
t.Errorf("unexpected error killing the process: %v", err)
103+
}
104+
}()
96105
go func() {
97-
cmd.Wait()
106+
cmd.Wait() //nolint:errcheck
98107
}()
99108

100-
pidFile.Write([]byte(fmt.Sprintf("%v", pid)))
109+
if _, err := pidFile.Write([]byte(fmt.Sprintf("%v", pid))); err != nil {
110+
t.Errorf("unexpected error writing the pid file: %v", err)
111+
}
112+
101113
pidFile.Close()
102114

103115
healthz.InstallPathHandler(mux, tt.healthzPath, n)
@@ -109,7 +121,7 @@ func TestNginxCheck(t *testing.T) {
109121
})
110122

111123
// pollute pid file
112-
pidFile.Write([]byte("999999"))
124+
pidFile.Write([]byte("999999")) //nolint:errcheck
113125
pidFile.Close()
114126

115127
t.Run("bad pid", func(t *testing.T) {

internal/ingress/controller/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ const (
9191

9292
// Configuration represents the content of nginx.conf file
9393
type Configuration struct {
94-
defaults.Backend `json:",squash"`
94+
defaults.Backend `json:",squash"` //nolint:staticcheck
9595

9696
// AllowSnippetAnnotations enable users to add their own snippets via ingress annotation.
9797
// If disabled, only snippets added via ConfigMap are added to ingress.

0 commit comments

Comments
 (0)