Skip to content

Commit 3b0b995

Browse files
committed
🌱 Remove gosec linter
It yields a lot of false positives as seen by the number of nolint directives this change removes.
1 parent c80ea33 commit 3b0b995

File tree

19 files changed

+27
-29
lines changed

19 files changed

+27
-29
lines changed

.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ linters:
1919
- gofmt
2020
- goimports
2121
- goprintffuncname
22-
- gosec
2322
- gosimple
2423
- govet
2524
- importas

pkg/cache/internal/informers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ func newGVKFixupWatcher(gvk schema.GroupVersionKind, watcher watch.Interface) wa
585585
// hammer the apiserver with list requests simultaneously.
586586
func calculateResyncPeriod(resync time.Duration) time.Duration {
587587
// the factor will fall into [0.9, 1.1)
588-
factor := rand.Float64()/5.0 + 0.9 //nolint:gosec
588+
factor := rand.Float64()/5.0 + 0.9
589589
return time.Duration(float64(resync.Nanoseconds()) * factor)
590590
}
591591

pkg/client/config/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func setConfigs(tc testCase, dir string) {
191191

192192
func createFiles(files map[string]string, dir string) error {
193193
for path, data := range files {
194-
if err := os.WriteFile(filepath.Join(dir, path), []byte(data), 0644); err != nil { //nolint:gosec
194+
if err := os.WriteFile(filepath.Join(dir, path), []byte(data), 0644); err != nil {
195195
return err
196196
}
197197
}

pkg/controller/controllerutil/controllerutil_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ var _ = Describe("Controllerutil", func() {
457457
BeforeEach(func() {
458458
deploy = &appsv1.Deployment{
459459
ObjectMeta: metav1.ObjectMeta{
460-
Name: fmt.Sprintf("deploy-%d", rand.Int31()), //nolint:gosec
460+
Name: fmt.Sprintf("deploy-%d", rand.Int31()),
461461
Namespace: "default",
462462
},
463463
}
@@ -606,7 +606,7 @@ var _ = Describe("Controllerutil", func() {
606606
BeforeEach(func() {
607607
deploy = &appsv1.Deployment{
608608
ObjectMeta: metav1.ObjectMeta{
609-
Name: fmt.Sprintf("deploy-%d", rand.Int31()), //nolint:gosec
609+
Name: fmt.Sprintf("deploy-%d", rand.Int31()),
610610
Namespace: "default",
611611
},
612612
}

pkg/controller/priorityqueue/priorityqueue_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ var _ = Describe("Controllerworkqueue", func() {
356356

357357
for range 20 {
358358
for i := range 1000 {
359-
rn := rand.N(100) //nolint:gosec // We don't need cryptographically secure entropy here
359+
rn := rand.N(100)
360360
if rn < 10 {
361361
q.AddWithOpts(AddOpts{After: time.Duration(rn) * time.Millisecond}, fmt.Sprintf("foo%d", i))
362362
} else {

pkg/envtest/webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,10 @@ func (o *WebhookInstallOptions) setupCA() error {
294294
return fmt.Errorf("unable to marshal webhook serving certs: %w", err)
295295
}
296296

297-
if err := os.WriteFile(filepath.Join(localServingCertsDir, "tls.crt"), certData, 0640); err != nil { //nolint:gosec
297+
if err := os.WriteFile(filepath.Join(localServingCertsDir, "tls.crt"), certData, 0640); err != nil {
298298
return fmt.Errorf("unable to write webhook serving cert to disk: %w", err)
299299
}
300-
if err := os.WriteFile(filepath.Join(localServingCertsDir, "tls.key"), keyData, 0640); err != nil { //nolint:gosec
300+
if err := os.WriteFile(filepath.Join(localServingCertsDir, "tls.key"), keyData, 0640); err != nil {
301301
return fmt.Errorf("unable to write webhook serving key to disk: %w", err)
302302
}
303303

pkg/internal/testing/controlplane/apiserver.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,10 +384,10 @@ func (s *APIServer) populateAPIServerCerts() error {
384384
return err
385385
}
386386

387-
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.crt"), certData, 0640); err != nil { //nolint:gosec
387+
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.crt"), certData, 0640); err != nil {
388388
return err
389389
}
390-
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.key"), keyData, 0640); err != nil { //nolint:gosec
390+
if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.key"), keyData, 0640); err != nil {
391391
return err
392392
}
393393

@@ -404,10 +404,10 @@ func (s *APIServer) populateAPIServerCerts() error {
404404
return err
405405
}
406406

407-
if err := os.WriteFile(filepath.Join(s.CertDir, saCertFile), saCert, 0640); err != nil { //nolint:gosec
407+
if err := os.WriteFile(filepath.Join(s.CertDir, saCertFile), saCert, 0640); err != nil {
408408
return err
409409
}
410-
return os.WriteFile(filepath.Join(s.CertDir, saKeyFile), saKey, 0640) //nolint:gosec
410+
return os.WriteFile(filepath.Join(s.CertDir, saKeyFile), saKey, 0640)
411411
}
412412

413413
// Stop stops this process gracefully, waits for its termination, and cleans up

pkg/internal/testing/controlplane/auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func (c *CertAuthn) Start() error {
128128
return fmt.Errorf("start called before configure")
129129
}
130130
caCrt := c.ca.CA.CertBytes()
131-
if err := os.WriteFile(c.caCrtPath(), caCrt, 0640); err != nil { //nolint:gosec
131+
if err := os.WriteFile(c.caCrtPath(), caCrt, 0640); err != nil {
132132
return fmt.Errorf("unable to save the client certificate CA to %s: %w", c.caCrtPath(), err)
133133
}
134134

pkg/internal/testing/process/process.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func pollURLUntilOK(url url.URL, interval time.Duration, ready chan bool, stopCh
215215
// there's probably certs *somewhere*,
216216
// but it's fine to just skip validating
217217
// them for health checks during testing
218-
InsecureSkipVerify: true, //nolint:gosec
218+
InsecureSkipVerify: true,
219219
},
220220
},
221221
}

pkg/log/zap/flags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func (ev *levelFlag) Set(flagValue string) error {
8585
}
8686
if logLevel > 0 {
8787
intLevel := -1 * logLevel
88-
ev.setFunc(zap.NewAtomicLevelAt(zapcore.Level(int8(intLevel)))) //nolint:gosec // We are not worried about integer overflows (G115) here.
88+
ev.setFunc(zap.NewAtomicLevelAt(zapcore.Level(int8(intLevel))))
8989
} else {
9090
return fmt.Errorf("invalid log level \"%s\"", flagValue)
9191
}

0 commit comments

Comments
 (0)