fix errcheck linter

Signed-off-by: Tim Ramlot <[email protected]>

Author: inteon

.golangci.yaml

@@ -6,7 +6,6 @@ linters:
     presets: [comments, common-false-positives, legacy, std-error-handling]
     rules:
       - linters:
-          - errcheck
           - errchkjson
           - forbidigo
           - gocritic

pkg/agent/config.go

@@ -232,7 +232,7 @@ func InitAgentCmdFlags(c *cobra.Command, cfg *AgentCmdFlags) {
 		false,
 		fmt.Sprintf("Turns on the %s mode. The flag --credentials-file must also be passed.", JetstackSecureOAuth),
 	)
-	c.PersistentFlags().MarkHidden("venafi-cloud")
+	_ = c.PersistentFlags().MarkHidden("venafi-cloud")
 	c.PersistentFlags().StringVarP(
 		&cfg.ClientID,
 		"client-id",
@@ -334,7 +334,7 @@ func InitAgentCmdFlags(c *cobra.Command, cfg *AgentCmdFlags) {
 		false,
 		"Deprecated. No longer has an effect.",
 	)
-	c.PersistentFlags().MarkDeprecated("disable-compression", "no longer has an effect")
+	_ = c.PersistentFlags().MarkDeprecated("disable-compression", "no longer has an effect")
 
 	// This is a hidden feature flag we use to build the "Machine Hub" feature
 	// gradually without impacting customers. Once the feature is GA, we will
@@ -345,7 +345,7 @@ func InitAgentCmdFlags(c *cobra.Command, cfg *AgentCmdFlags) {
 		false,
 		"Enables the MachineHub mode. The agent will push data to CyberArk MachineHub.",
 	)
-	c.PersistentFlags().MarkHidden("machine-hub")
+	_ = c.PersistentFlags().MarkHidden("machine-hub")
 
 }
 

pkg/datagatherer/k8s/dynamic.go

@@ -371,11 +371,15 @@ func redactList(list []*api.GatheredResource, excludeAnnotKeys, excludeLabelKeys
 			for _, gvk := range gvks {
 				// secret object
 				if gvk.Kind == "Secret" && (gvk.Group == "core" || gvk.Group == "") {
-					Select(SecretSelectedFields, resource)
+					if err := Select(SecretSelectedFields, resource); err != nil {
+						return err
+					}
 
 					// route object
 				} else if gvk.Kind == "Route" && gvk.Group == "route.openshift.io" {
-					Select(RouteSelectedFields, resource)
+					if err := Select(RouteSelectedFields, resource); err != nil {
+						return err
+					}
 				}
 			}
 

pkg/datagatherer/k8s/dynamic_test.go

@@ -667,7 +667,7 @@ func TestDynamicGatherer_Fetch(t *testing.T) {
 			factory := dynamicinformer.NewFilteredDynamicSharedInformerFactory(cl, 10*time.Minute, metav1.NamespaceAll, nil)
 			resourceInformer := factory.ForResource(tc.config.GroupVersionResource)
 			testInformer := resourceInformer.Informer()
-			testInformer.AddEventHandler(k8scache.ResourceEventHandlerFuncs{
+			_, err = testInformer.AddEventHandler(k8scache.ResourceEventHandlerFuncs{
 				DeleteFunc: func(obj interface{}) {
 					defer wg.Done()
 					time.Sleep(100 * time.Millisecond)
@@ -677,6 +677,7 @@ func TestDynamicGatherer_Fetch(t *testing.T) {
 					time.Sleep(100 * time.Millisecond)
 				},
 			})
+			require.NoError(t, err)
 			//start test Informer
 			factory.Start(ctx.Done())
 			k8scache.WaitForCacheSync(ctx.Done(), testInformer.HasSynced)
@@ -983,7 +984,7 @@ func TestDynamicGathererNativeResources_Fetch(t *testing.T) {
 				informers.WithNamespace(metav1.NamespaceAll),
 				informers.WithTweakListOptions(func(options *metav1.ListOptions) {}))
 			testInformer := factory.Core().V1().Pods().Informer()
-			testInformer.AddEventHandler(k8scache.ResourceEventHandlerFuncs{
+			_, err = testInformer.AddEventHandler(k8scache.ResourceEventHandlerFuncs{
 				DeleteFunc: func(obj interface{}) {
 					defer wg.Done()
 					time.Sleep(100 * time.Millisecond)
@@ -993,6 +994,7 @@ func TestDynamicGathererNativeResources_Fetch(t *testing.T) {
 					time.Sleep(100 * time.Millisecond)
 				},
 			})
+			require.NoError(t, err)
 
 			//start test Informer
 			factory.Start(ctx.Done())

pkg/datagatherer/k8s/fieldfilter.go

@@ -80,10 +80,8 @@ func Select(fields []FieldPath, resource *unstructured.Unstructured) error {
 }
 
 // Redact removes the supplied fields from the resource
-func Redact(fields []FieldPath, resource *unstructured.Unstructured) error {
+func Redact(fields []FieldPath, resource *unstructured.Unstructured) {
 	for _, field := range fields {
 		unstructured.RemoveNestedField(resource.Object, field...)
 	}
-
-	return nil
 }

pkg/datagatherer/k8s/fieldfilter_test.go

@@ -175,8 +175,7 @@ func TestRedactSecret(t *testing.T) {
 		{"data", "tls.key"},
 	}
 
-	err := Redact(fieldsToRedact, resource)
-	require.NoError(t, err)
+	Redact(fieldsToRedact, resource)
 
 	bytes, err := json.MarshalIndent(resource, "", "    ")
 	require.NoError(t, err)
@@ -217,8 +216,7 @@ func TestRedactPod(t *testing.T) {
 		{"metadata", "managedFields"},
 	}
 
-	err := Redact(fieldsToRedact, resource)
-	require.NoError(t, err)
+	Redact(fieldsToRedact, resource)
 
 	bytes, err := json.MarshalIndent(resource, "", "    ")
 	require.NoError(t, err)
@@ -248,8 +246,7 @@ func TestRedactMissingField(t *testing.T) {
 		{"missing"},
 	}
 
-	err := Redact(fieldsToRedact, resource)
-	require.NoError(t, err)
+	Redact(fieldsToRedact, resource)
 	bytes, err := json.MarshalIndent(resource, "", "    ")
 	require.NoError(t, err)
 

pkg/logs/logs.go

@@ -77,7 +77,7 @@ func AddFlags(fs *pflag.FlagSet) {
 	features.AddFlag(&tfs)
 	tfs.VisitAll(func(f *pflag.Flag) {
 		if !visibleFlagNames.Has(f.Name) {
-			tfs.MarkHidden(f.Name)
+			_ = tfs.MarkHidden(f.Name)
 		}
 
 		// The original usage string includes details about how

pkg/testutil/envtest.go

@@ -203,7 +203,7 @@ func FakeVenafiCloud(t *testing.T) (_ *httptest.Server, _ *x509.Certificate, set
 		apiKey := r.Header.Get("Tppl-Api-Key")
 		if accessToken != "VALID_ACCESS_TOKEN" && apiKey != "VALID_API_KEY" {
 			w.WriteHeader(http.StatusUnauthorized)
-			w.Write([]byte(`{"error":"expected header 'Authorization: Bearer VALID_ACCESS_TOKEN' or 'tppl-api-key: VALID_API_KEY', but got Authorization=` + r.Header.Get("Authorization") + ` and tppl-api-key=` + r.Header.Get("Tppl-Api-Key")))
+			_, _ = w.Write([]byte(`{"error":"expected header 'Authorization: Bearer VALID_ACCESS_TOKEN' or 'tppl-api-key: VALID_API_KEY', but got Authorization=` + r.Header.Get("Authorization") + ` and tppl-api-key=` + r.Header.Get("Tppl-Api-Key")))
 			return
 		}
 		if r.URL.Path == "/v1/tlspk/upload/clusterdata/no" {