Merge pull request #211 from erikgb/enable-more-linters

Enable some additional golangci-lint linters

Author: rkwmt

.golangci.yaml

@@ -1,5 +1,13 @@
 version: "2"
 linters:
+  default: standard
+  enable:
+    - contextcheck
+    - errorlint
+    - gosec
+    - misspell
+    - modernize
+    - nilnil
   settings:
     errcheck:
       exclude-functions:

api/accurate/v1/conversion_test.go

@@ -18,8 +18,8 @@ func TestFuzzyConversion(t *testing.T) {
 	}))
 }
 
-func SubNamespaceStatusFuzzFunc(_ runtimeserializer.CodecFactory) []interface{} {
-	return []interface{}{
+func SubNamespaceStatusFuzzFunc(_ runtimeserializer.CodecFactory) []any {
+	return []any{
 		SubNamespaceStatusFuzzer,
 	}
 }

api/accurate/v2alpha1/conversion_test.go

@@ -18,8 +18,8 @@ func TestFuzzyConversion(t *testing.T) {
 	}))
 }
 
-func SubNamespaceStatusFuzzFunc(_ runtimeserializer.CodecFactory) []interface{} {
-	return []interface{}{
+func SubNamespaceStatusFuzzFunc(_ runtimeserializer.CodecFactory) []any {
+	return []any{
 		SubNamespaceStatusFuzzer,
 	}
 }

cmd/accurate-controller/sub/root.go

@@ -42,11 +42,11 @@ var rootCmd = &cobra.Command{
 		cmd.SilenceUsage = true
 		h, p, err := net.SplitHostPort(options.webhookAddr)
 		if err != nil {
-			return fmt.Errorf("invalid webhook address: %s, %v", options.webhookAddr, err)
+			return fmt.Errorf("invalid webhook address: %s, %w", options.webhookAddr, err)
 		}
 		numPort, err := strconv.Atoi(p)
 		if err != nil {
-			return fmt.Errorf("invalid webhook address: %s, %v", options.webhookAddr, err)
+			return fmt.Errorf("invalid webhook address: %s, %w", options.webhookAddr, err)
 		}
 		ns := os.Getenv("POD_NAMESPACE")
 		if ns == "" {

cmd/accurate-controller/sub/run.go

@@ -167,7 +167,7 @@ func subMain(ns, addr string, port int) error {
 
 	logger.Info("starting manager")
 	if err := mgr.Start(ctx); err != nil {
-		return fmt.Errorf("problem running manager: %s", err)
+		return fmt.Errorf("problem running manager: %w", err)
 	}
 	return nil
 }

cmd/kubectl-accurate/sub/namespace_describe.go

@@ -57,7 +57,7 @@ func (o *nsDescribeOpts) Fill(streams genericiooptions.IOStreams, config *generi
 	return nil
 }
 
-func (o *nsDescribeOpts) printf(s string, args ...interface{}) {
+func (o *nsDescribeOpts) printf(s string, args ...any) {
 	fmt.Fprintf(o.streams.Out, s, args...)
 }
 
@@ -159,8 +159,7 @@ func (o *nsDescribeOpts) Run(ctx context.Context) error {
 	for _, gvk := range cfg.Watches {
 		o.printResource(ctx, w, gvk)
 	}
-	w.Flush()
-	return nil
+	return w.Flush()
 }
 
 func (o *nsDescribeOpts) printResource(ctx context.Context, w io.Writer, gvk metav1.GroupVersionKind) {

controllers/namespace_controller_test.go

@@ -113,11 +113,11 @@ var _ = Describe("Namespace controller", func() {
 		role1 := roleRes.DeepCopy()
 		role1.SetNamespace("tmpl")
 		role1.SetName("role1")
-		role1.Object["rules"] = []interface{}{
-			map[string]interface{}{
-				"apiGroups": []interface{}{""},
-				"resources": []interface{}{"pods"},
-				"verbs":     []interface{}{"get", "watch", "list"},
+		role1.Object["rules"] = []any{
+			map[string]any{
+				"apiGroups": []any{""},
+				"resources": []any{"pods"},
+				"verbs":     []any{"get", "watch", "list"},
 			},
 		}
 		Expect(k8sClient.Create(ctx, role1)).To(Succeed())
@@ -126,19 +126,19 @@ var _ = Describe("Namespace controller", func() {
 		role2.SetNamespace("tmpl")
 		role2.SetName("role2")
 		role2.SetAnnotations(map[string]string{constants.AnnPropagate: constants.PropagateCreate})
-		role2.Object["rules"] = []interface{}{
-			map[string]interface{}{
-				"apiGroups": []interface{}{""},
-				"resources": []interface{}{"pods"},
-				"verbs":     []interface{}{"get", "watch", "list"},
+		role2.Object["rules"] = []any{
+			map[string]any{
+				"apiGroups": []any{""},
+				"resources": []any{"pods"},
+				"verbs":     []any{"get", "watch", "list"},
 			},
 		}
 		Expect(k8sClient.Create(ctx, role2)).To(Succeed())
 
 		secret := secretRes.DeepCopy()
 		secret.SetNamespace("tmpl")
 		secret.SetName("foo")
-		secret.Object["data"] = map[string]interface{}{
+		secret.Object["data"] = map[string]any{
 			"foo": "MjAyMC0wOS0xM1QwNDozOToxMFo=",
 		}
 		secret.SetAnnotations(map[string]string{constants.AnnPropagate: constants.PropagateUpdate})
@@ -151,7 +151,7 @@ var _ = Describe("Namespace controller", func() {
 		secret2 := secretRes.DeepCopy()
 		secret2.SetNamespace("ns1")
 		secret2.SetName("bar")
-		secret2.Object["data"] = map[string]interface{}{
+		secret2.Object["data"] = map[string]any{
 			"bar": "MjAyMC0wOS0xM1QwNDozOToxMFo=",
 		}
 		secret2.SetAnnotations(map[string]string{constants.AnnPropagate: constants.PropagateUpdate})

controllers/subnamespace_controller.go

@@ -90,7 +90,7 @@ func (r *SubNamespaceReconciler) finalize(ctx context.Context, sn *accuratev2.Su
 		logger.Info("deleted namespace", "name", ns.Name)
 	}
 
-	return r.removeFinalizer(context.Background(), sn)
+	return r.removeFinalizer(ctx, sn)
 }
 
 func (r *SubNamespaceReconciler) removeFinalizer(ctx context.Context, sn *accuratev2.SubNamespace) error {
@@ -102,8 +102,8 @@ func (r *SubNamespaceReconciler) removeFinalizer(ctx context.Context, sn *accura
 	controllerutil.RemoveFinalizer(sn, constants.Finalizer)
 
 	// We'll use a JSON Merge Patch here to avoid removal of finalizers added by other controllers
-	patch := map[string]interface{}{
-		"metadata": map[string]interface{}{
+	patch := map[string]any{
+		"metadata": map[string]any{
 			"finalizers": sn.GetFinalizers(),
 		},
 	}

e2e/run_test.go

@@ -11,7 +11,7 @@ import (
 func kubectl(input []byte, args ...string) ([]byte, error) {
 	stdout := new(bytes.Buffer)
 	stderr := new(bytes.Buffer)
-	cmd := exec.Command("kubectl", args...)
+	cmd := exec.Command("kubectl", args...) // #nosec G204 -- args are static/test-controlled
 	cmd.Stdout = stdout
 	cmd.Stderr = stderr
 	if input != nil {
@@ -21,7 +21,7 @@ func kubectl(input []byte, args ...string) ([]byte, error) {
 	if err == nil {
 		return stdout.Bytes(), nil
 	}
-	return nil, fmt.Errorf("kubectl failed with %s: stderr=%s", err, stderr)
+	return nil, fmt.Errorf("kubectl failed with %w: stderr=%s", err, stderr.String())
 }
 
 func kubectlSafe(input []byte, args ...string) []byte {

hooks/allow-cascade-delete/suite_test.go

@@ -119,7 +119,7 @@ var _ = BeforeSuite(func() {
 	dialer := &net.Dialer{Timeout: time.Second}
 	addrPort := fmt.Sprintf("%s:%d", webhookInstallOptions.LocalServingHost, webhookInstallOptions.LocalServingPort)
 	Eventually(func() error {
-		conn, err := tls.DialWithDialer(dialer, "tcp", addrPort, &tls.Config{InsecureSkipVerify: true})
+		conn, err := tls.DialWithDialer(dialer, "tcp", addrPort, &tls.Config{InsecureSkipVerify: true}) // #nosec G402 -- test environment with self-signed cert
 		if err != nil {
 			return err
 		}