fix staticcheck linter

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

Author: inteon

.golangci.yaml

@@ -17,7 +17,6 @@ linters:
           - nilerr
           - noctx
           - predeclared
-          - staticcheck
           - unconvert
           - unparam
           - usestdlibvars

cmd/root.go

@@ -67,7 +67,7 @@ func setFlagsFromEnv(prefix string, fs *pflag.FlagSet) {
 		}
 		// remove trailing _ to reduce common errors with the prefix, i.e. people setting it to MY_PROG_
 		cleanPrefix := strings.TrimSuffix(prefix, "_")
-		name := fmt.Sprintf("%s_%s", cleanPrefix, strings.Replace(strings.ToUpper(f.Name), "-", "_", -1))
+		name := fmt.Sprintf("%s_%s", cleanPrefix, strings.ReplaceAll(strings.ToUpper(f.Name), "-", "_"))
 		if e, ok := os.LookupEnv(name); ok {
 			_ = f.Value.Set(e)
 		}

pkg/agent/config.go

@@ -247,7 +247,7 @@ func InitAgentCmdFlags(c *cobra.Command, cfg *AgentCmdFlags) {
 		"private-key-path",
 		"",
 		"",
-		fmt.Sprintf("To be used in conjunction with --client-id. The path to the private key file for the service account."),
+		"To be used in conjunction with --client-id. The path to the private key file for the service account.",
 	)
 	c.PersistentFlags().BoolVarP(
 		&cfg.OneShot,
@@ -531,8 +531,8 @@ func ValidateAndCombineConfig(log logr.Logger, cfg Config, flags AgentCmdFlags)
 	// Validation of `venafi-cloud.upload_path`.
 	{
 		var uploadPath string
-		switch {
-		case res.TLSPKMode == VenafiCloudKeypair:
+		switch res.TLSPKMode { // nolint:exhaustive
+		case VenafiCloudKeypair:
 			if cfg.VenafiCloud == nil || cfg.VenafiCloud.UploadPath == "" {
 				errs = multierror.Append(errs, fmt.Errorf("the venafi-cloud.upload_path field is required when using the %s mode", res.TLSPKMode))
 				break // Skip to the end of the switch statement.
@@ -544,7 +544,7 @@ func ValidateAndCombineConfig(log logr.Logger, cfg Config, flags AgentCmdFlags)
 			}
 
 			uploadPath = cfg.VenafiCloud.UploadPath
-		case res.TLSPKMode == VenafiCloudVenafiConnection:
+		case VenafiCloudVenafiConnection:
 			// The venafi-cloud.upload_path was initially meant to let users
 			// configure HTTP proxies, but it has never been used since HTTP
 			// proxies don't rewrite paths. Thus, we've disabled the ability to
@@ -577,18 +577,18 @@ func ValidateAndCombineConfig(log logr.Logger, cfg Config, flags AgentCmdFlags)
 	if res.TLSPKMode != Off {
 		var clusterID string
 		var organizationID string // Only used by the old jetstack-secure mode.
-		switch {
-		case res.TLSPKMode == VenafiCloudKeypair:
+		switch res.TLSPKMode {    // nolint:exhaustive
+		case VenafiCloudKeypair:
 			if cfg.ClusterID == "" {
 				errs = multierror.Append(errs, fmt.Errorf("cluster_id is required in %s mode", res.TLSPKMode))
 			}
 			clusterID = cfg.ClusterID
-		case res.TLSPKMode == VenafiCloudVenafiConnection:
+		case VenafiCloudVenafiConnection:
 			if cfg.ClusterID == "" {
 				errs = multierror.Append(errs, fmt.Errorf("cluster_id is required in %s mode", res.TLSPKMode))
 			}
 			clusterID = cfg.ClusterID
-		case res.TLSPKMode == JetstackSecureOAuth || res.TLSPKMode == JetstackSecureAPIToken:
+		case JetstackSecureOAuth, JetstackSecureAPIToken:
 			if cfg.OrganizationID == "" {
 				errs = multierror.Append(errs, fmt.Errorf("organization_id is required"))
 			}
@@ -637,7 +637,7 @@ func ValidateAndCombineConfig(log logr.Logger, cfg Config, flags AgentCmdFlags)
 	}
 
 	// Validation of --install-namespace.
-	var installNS string = flags.InstallNS
+	installNS := flags.InstallNS
 	if flags.InstallNS == "" {
 		var err error
 		installNS, err = getInClusterNamespace()
@@ -650,7 +650,7 @@ func ValidateAndCombineConfig(log logr.Logger, cfg Config, flags AgentCmdFlags)
 	// Validation of --venafi-connection and --venafi-connection-namespace.
 	if res.TLSPKMode == VenafiCloudVenafiConnection {
 		res.VenConnName = flags.VenConnName
-		var venConnNS string = flags.VenConnNS
+		venConnNS := flags.VenConnNS
 		if flags.VenConnNS == "" {
 			venConnNS = installNS
 		}
@@ -714,8 +714,8 @@ func validateCredsAndCreateClient(log logr.Logger, flagCredentialsPath, flagClie
 
 	var preflightClient client.Client
 	metadata := &api.AgentMetadata{Version: version.PreflightVersion, ClusterID: cfg.ClusterID}
-	switch {
-	case cfg.TLSPKMode == JetstackSecureOAuth:
+	switch cfg.TLSPKMode {
+	case JetstackSecureOAuth:
 		// Note that there are no command line flags to configure the
 		// JetstackSecureOAuth mode.
 		credsBytes, err := readCredentialsFile(flagCredentialsPath)
@@ -734,7 +734,7 @@ func validateCredsAndCreateClient(log logr.Logger, flagCredentialsPath, flagClie
 		if err != nil {
 			errs = multierror.Append(errs, err)
 		}
-	case cfg.TLSPKMode == VenafiCloudKeypair:
+	case VenafiCloudKeypair:
 		var creds client.Credentials
 
 		if flagClientID != "" && flagCredentialsPath != "" {
@@ -777,7 +777,7 @@ func validateCredsAndCreateClient(log logr.Logger, flagCredentialsPath, flagClie
 		if err != nil {
 			errs = multierror.Append(errs, err)
 		}
-	case cfg.TLSPKMode == VenafiCloudVenafiConnection:
+	case VenafiCloudVenafiConnection:
 		var restCfg *rest.Config
 		restCfg, err := kubeconfig.LoadRESTConfig("")
 		if err != nil {
@@ -789,13 +789,13 @@ func validateCredsAndCreateClient(log logr.Logger, flagCredentialsPath, flagClie
 		if err != nil {
 			errs = multierror.Append(errs, err)
 		}
-	case cfg.TLSPKMode == JetstackSecureAPIToken:
+	case JetstackSecureAPIToken:
 		var err error
 		preflightClient, err = client.NewAPITokenClient(metadata, flagAPIToken, cfg.Server)
 		if err != nil {
 			errs = multierror.Append(errs, err)
 		}
-	case cfg.TLSPKMode == Off:
+	case Off:
 		// No client needed in this mode.
 	default:
 		panic(fmt.Errorf("programmer mistake: auth mode not implemented: %s", cfg.TLSPKMode))

pkg/datagatherer/k8s/dynamic.go

@@ -76,27 +76,27 @@ func (c *ConfigDynamic) UnmarshalYAML(unmarshal func(interface{}) error) error {
 
 // validate validates the configuration.
 func (c *ConfigDynamic) validate() error {
-	var errors []string
+	var errs []string
 	if len(c.ExcludeNamespaces) > 0 && len(c.IncludeNamespaces) > 0 {
-		errors = append(errors, "cannot set excluded and included namespaces")
+		errs = append(errs, "cannot set excluded and included namespaces")
 	}
 
 	if c.GroupVersionResource.Resource == "" {
-		errors = append(errors, "invalid configuration: GroupVersionResource.Resource cannot be empty")
+		errs = append(errs, "invalid configuration: GroupVersionResource.Resource cannot be empty")
 	}
 
 	for i, selectorString := range c.FieldSelectors {
 		if selectorString == "" {
-			errors = append(errors, fmt.Sprintf("invalid field selector %d: must not be empty", i))
+			errs = append(errs, fmt.Sprintf("invalid field selector %d: must not be empty", i))
 		}
 		_, err := fields.ParseSelector(selectorString)
 		if err != nil {
-			errors = append(errors, fmt.Sprintf("invalid field selector %d: %s", i, err))
+			errs = append(errs, fmt.Sprintf("invalid field selector %d: %s", i, err))
 		}
 	}
 
-	if len(errors) > 0 {
-		return fmt.Errorf(strings.Join(errors, ", "))
+	if len(errs) > 0 {
+		return errors.New(strings.Join(errs, ", "))
 	}
 
 	return nil

pkg/datagatherer/k8s/dynamic_test.go

@@ -23,7 +23,6 @@ import (
 	"k8s.io/client-go/dynamic/dynamicinformer"
 	"k8s.io/client-go/dynamic/fake"
 	"k8s.io/client-go/informers"
-	"k8s.io/client-go/kubernetes"
 	fakeclientset "k8s.io/client-go/kubernetes/fake"
 	k8scache "k8s.io/client-go/tools/cache"
 
@@ -968,8 +967,7 @@ func TestDynamicGathererNativeResources_Fetch(t *testing.T) {
 			var wg sync.WaitGroup
 			ctx := context.Background()
 
-			var clientset kubernetes.Interface
-			clientset = fakeclientset.NewSimpleClientset(tc.addObjects...)
+			clientset := fakeclientset.NewSimpleClientset(tc.addObjects...)
 
 			// init the datagatherer's informer with the client
 			dg, err := tc.config.newDataGathererWithClient(ctx, nil, clientset)

pkg/internal/cyberark/identity/mock.go

@@ -115,7 +115,7 @@ func (mis *mockIdentityServer) handleStartAuthentication(w http.ResponseWriter,
 
 	if err := checkRequestHeaders(r); err != nil {
 		w.WriteHeader(http.StatusForbidden)
-		_, _ = w.Write([]byte(fmt.Sprintf(`{"message":"issues with headers sent to mock server: %s"}`, err.Error())))
+		fmt.Fprintf(w, `{"message":"issues with headers sent to mock server: %s"}`, err.Error())
 		return
 	}
 
@@ -126,7 +126,7 @@ func (mis *mockIdentityServer) handleStartAuthentication(w http.ResponseWriter,
 
 	if err := decoder.Decode(&reqBody); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
-		_, _ = w.Write([]byte(fmt.Sprintf(`{"message":"failed to unmarshal request body: %s"}`, err)))
+		fmt.Fprintf(w, `{"message":"failed to unmarshal request body: %s"}`, err)
 		return
 	}
 
@@ -172,7 +172,7 @@ func (mis *mockIdentityServer) handleAdvanceAuthentication(w http.ResponseWriter
 
 	if err := checkRequestHeaders(r); err != nil {
 		w.WriteHeader(http.StatusForbidden)
-		_, _ = w.Write([]byte(fmt.Sprintf(`{"message":"issues with headers sent to mock server: %s"}`, err.Error())))
+		fmt.Fprintf(w, `{"message":"issues with headers sent to mock server: %s"}`, err.Error())
 	}
 
 	decoder := json.NewDecoder(r.Body)
@@ -182,7 +182,7 @@ func (mis *mockIdentityServer) handleAdvanceAuthentication(w http.ResponseWriter
 
 	if err := decoder.Decode(&advanceBody); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
-		_, _ = w.Write([]byte(fmt.Sprintf(`{"message":"failed to unmarshal request body: %s"}`, err)))
+		fmt.Fprintf(w, `{"message":"failed to unmarshal request body: %s"}`, err)
 		return
 	}
 

pkg/logs/logs_test.go

@@ -410,7 +410,7 @@ level=INFO msg="this is a happy log that should show as INFO" source=agent
 
 	for _, line := range strings.Split(given, "\n") {
 		// Simulate the current agent's logs.
-		logger.Printf(line)
+		logger.Printf(line) // nolint:staticcheck
 	}
 
 	assert.Equal(t, expect, gotBuf.String())