style: Upgrade linter and patch code

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
       - uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.55.2
+          version: v1.56.1
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

Makefile

@@ -175,7 +175,7 @@ ifndef HAS_GOLANGCI_LINT
 ifndef HAS_CURL
 	$(error You must install curl)
 endif
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.55.2
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.56.1
 endif
 ifndef HAS_GIT
 	$(error You must install Git)

pkg/s3-proxy/authx/authentication/oidc.go

@@ -329,12 +329,15 @@ func (s *service) oidcAuthMiddleware(res *config.Resource) func(http.Handler) ht
 			if claims["family_name"] != nil {
 				ouser.FamilyName, _ = claims["family_name"].(string)
 			}
+
 			if claims["given_name"] != nil {
 				ouser.GivenName, _ = claims["given_name"].(string)
 			}
+
 			if claims["name"] != nil {
 				ouser.Name, _ = claims["name"].(string)
 			}
+
 			if claims["preferred_username"] != nil {
 				ouser.PreferredUsername, _ = claims["preferred_username"].(string)
 			}

pkg/s3-proxy/authx/authorization/header-oidc.go

@@ -32,7 +32,6 @@ func isHeaderOIDCAuthorizedBasic(groups []string, email string, authorizationAcc
 			}
 		} else {
 			// Not a regex case
-
 			// Check group case
 			if item.Group != "" {
 				result := funk.Contains(groups, item.Group)

pkg/s3-proxy/authx/authorization/main.go

@@ -73,6 +73,7 @@ func Middleware(
 			if resource.OIDC != nil || resource.Header != nil {
 				// Initialize variables
 				var authorizationProvider string
+				// Initialize variables
 				var headerOIDCResource *config.ResourceHeaderOIDC
 
 				// Check if resource is OIDC
@@ -103,6 +104,7 @@ func Middleware(
 				if headerOIDCResource.AuthorizationOPAServer != nil {
 					var err error
 					authorized, err = isOPAServerAuthorized(r, user, headerOIDCResource)
+					// Check error
 					if err != nil {
 						// Check if bucket request context doesn't exist to use local default files
 						if brctx == nil {

pkg/s3-proxy/bucket/bucket-req-impl.go

@@ -163,7 +163,6 @@ func (bri *bucketReqImpl) Get(ctx context.Context, input *GetInput) {
 			err = err2
 		} else if headOutput != nil {
 			// File found
-
 			// Redirect to signed url
 			err = bri.redirectToSignedURL(ctx, key, input)
 		}

pkg/s3-proxy/config/managerimpl.go

@@ -56,7 +56,7 @@ func (impl *managerimpl) Load() error {
 	// Loop over config files
 	funk.ForEach(impl.configs, func(vip *viper.Viper) {
 		// Add hooks for on change events
-		vip.OnConfigChange(func(in fsnotify.Event) {
+		vip.OnConfigChange(func(_ fsnotify.Event) {
 			impl.logger.Infof("Reload configuration detected for file %s", vip.ConfigFileUsed())
 
 			// Reload config

pkg/s3-proxy/config/validation.go

@@ -299,7 +299,7 @@ func validateSSLCertificateComponentConfig(
 		}
 
 		if componentURLConfig != nil {
-			err = validateSSLURLConfig(componentURLConfig, fmt.Sprintf("%sUrlConfig", componentName))
+			err = validateSSLURLConfig(componentURLConfig, componentName+"UrlConfig")
 			if err != nil {
 				return err
 			}
@@ -315,7 +315,7 @@ func validateSSLURLConfig(urlConfig *SSLURLConfig, component string) error {
 	if urlConfig.HTTPTimeout != "" {
 		duration, err := time.ParseDuration(urlConfig.HTTPTimeout)
 		if err != nil {
-			return errors.Wrap(err, fmt.Sprintf("%s.httpTimeout is invalid", component))
+			return errors.Wrap(err, component+".httpTimeout is invalid")
 		}
 
 		if duration < time.Duration(0) {

pkg/s3-proxy/server/server.go

@@ -116,6 +116,7 @@ func (svr *Server) GenerateServer() error {
 		}
 		// Change server handler
 		server.Handler = r
+
 		svr.logger.Info("Server handler reloaded")
 	})
 
@@ -236,7 +237,7 @@ func (svr *Server) generateRouter() (http.Handler, error) {
 				// Add authorization middleware to router
 				rt2 = rt2.With(authorization.Middleware(svr.cfgManager, svr.metricsCl))
 
-				rt2.Get("/", func(rw http.ResponseWriter, req *http.Request) {
+				rt2.Get("/", func(_ http.ResponseWriter, req *http.Request) {
 					// Get response handler
 					resHan := responsehandler.GetResponseHandlerFromContext(req.Context())
 
@@ -286,7 +287,7 @@ func (svr *Server) generateRouter() (http.Handler, error) {
 				// Check if GET action is enabled
 				if tgt.Actions.GET != nil && tgt.Actions.GET.Enabled {
 					// Add GET method to router
-					rt2.Get("/*", func(rw http.ResponseWriter, req *http.Request) {
+					rt2.Get("/*", func(_ http.ResponseWriter, req *http.Request) {
 						// Get bucket request context
 						brctx := bucket.GetBucketRequestContextFromContext(req.Context())
 						// Get response handler
@@ -367,7 +368,7 @@ func (svr *Server) generateRouter() (http.Handler, error) {
 				// Check if PUT action is enabled
 				if tgt.Actions.PUT != nil && tgt.Actions.PUT.Enabled {
 					// Add PUT method to router
-					rt2.Put("/*", func(rw http.ResponseWriter, req *http.Request) {
+					rt2.Put("/*", func(_ http.ResponseWriter, req *http.Request) {
 						// Get bucket request context
 						brctx := bucket.GetBucketRequestContextFromContext(req.Context())
 						// Get response handler
@@ -429,7 +430,7 @@ func (svr *Server) generateRouter() (http.Handler, error) {
 				// Check if DELETE action is enabled
 				if tgt.Actions.DELETE != nil && tgt.Actions.DELETE.Enabled {
 					// Add DELETE method to router
-					rt2.Delete("/*", func(rw http.ResponseWriter, req *http.Request) {
+					rt2.Delete("/*", func(_ http.ResponseWriter, req *http.Request) {
 						// Get bucket request context
 						brctx := bucket.GetBucketRequestContextFromContext(req.Context())
 						// Get response handler

pkg/s3-proxy/server/tls.go

@@ -6,7 +6,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"crypto/x509/pkix"
-	"fmt"
 	"math/big"
 	"time"
 
@@ -142,8 +141,7 @@ func getCertificateFromConfig(certConfig *config.ServerSSLCertificate, logger lo
 		if err != nil {
 			logger.Errorf("Failed to get certificate from URL %s: %v", *certConfig.CertificateURL, err)
 
-			return nil, errors.Wrap(err, fmt.Sprintf(
-				"failed to get certificate from URL: %s", *certConfig.CertificateURL))
+			return nil, errors.Wrap(err, "failed to get certificate from URL: "+*certConfig.CertificateURL)
 		}
 
 	default:
@@ -164,8 +162,7 @@ func getCertificateFromConfig(certConfig *config.ServerSSLCertificate, logger lo
 		if err != nil {
 			logger.Errorf("Failed to get private key from URL %s: %v", *certConfig.PrivateKeyURL, err)
 
-			return nil, errors.Wrap(err, fmt.Sprintf(
-				"failed to get private key from URL: %s", *certConfig.PrivateKeyURL))
+			return nil, errors.Wrap(err, "failed to get private key from URL: "+*certConfig.PrivateKeyURL)
 		}
 
 	default:

pkg/s3-proxy/utils/generalutils/utils.go

@@ -180,7 +180,7 @@ type GetDocumentFromURLOption func(awsCfg *aws.Config, httpClient *http.Client)
 
 // WithAWSEndpoint is an option for GetDocumentFromURL to set the AWS service endpoint.
 func WithAWSEndpoint(endpoint string) GetDocumentFromURLOption {
-	return func(awsCfg *aws.Config, httpClient *http.Client) {
+	return func(awsCfg *aws.Config, _ *http.Client) {
 		if awsCfg != nil {
 			awsCfg.Endpoint = aws.String(endpoint)
 		}
@@ -189,7 +189,7 @@ func WithAWSEndpoint(endpoint string) GetDocumentFromURLOption {
 
 // WithAWSRegion is an option for GetDocumentFromURL to set the AWS region.
 func WithAWSRegion(region string) GetDocumentFromURLOption {
-	return func(awsCfg *aws.Config, httpClient *http.Client) {
+	return func(awsCfg *aws.Config, _ *http.Client) {
 		if awsCfg != nil {
 			awsCfg.Region = aws.String(region)
 		}
@@ -198,7 +198,7 @@ func WithAWSRegion(region string) GetDocumentFromURLOption {
 
 // WithAWSDisableSSL is an option for GetDocumentFromURL to optionally disable SSL for requests.
 func WithAWSDisableSSL(disableSSL bool) GetDocumentFromURLOption {
-	return func(awsCfg *aws.Config, httpClient *http.Client) {
+	return func(awsCfg *aws.Config, _ *http.Client) {
 		if awsCfg != nil {
 			awsCfg.DisableSSL = aws.Bool(disableSSL)
 		}
@@ -207,7 +207,7 @@ func WithAWSDisableSSL(disableSSL bool) GetDocumentFromURLOption {
 
 // WithAWSStaticCredentials is an option for GetDocumentFromURL to set AWS credentials.
 func WithAWSStaticCredentials(accessKey, secretKey, token string) GetDocumentFromURLOption {
-	return func(awsCfg *aws.Config, httpClient *http.Client) {
+	return func(awsCfg *aws.Config, _ *http.Client) {
 		if awsCfg != nil {
 			awsCfg.Credentials = credentials.NewStaticCredentials(accessKey, secretKey, token)
 		}
@@ -349,7 +349,7 @@ func getDocumentFromS3(bucket, key string, opts ...GetDocumentFromURLOption) ([]
 		// Otherwise, we end up with URLs like https://bucketname.127.0.0.1/
 		endpointURL, err := url.Parse(*cfg.Endpoint)
 		if err != nil {
-			return nil, errors.Wrap(err, fmt.Sprintf("invalid S3 endpoint URL: %s", *cfg.Endpoint))
+			return nil, errors.Wrap(err, "invalid S3 endpoint URL: "+*cfg.Endpoint)
 		}
 
 		hostIP := net.ParseIP(endpointURL.Hostname())

pkg/s3-proxy/utils/templateutils/template.go

@@ -3,7 +3,6 @@ package templateutils
 import (
 	"bytes"
 	"context"
-	"fmt"
 	"os"
 	"strings"
 	"text/template"
@@ -154,8 +153,9 @@ func s3ProxyFuncMap(t *template.Template) template.FuncMap {
 
 		if v, ok := includedNames[name]; ok {
 			if v > recursionMaxNums {
-				return "", errors.Wrapf(fmt.Errorf("unable to execute template"), "rendering template has a nested reference name: %s", name)
+				return "", errors.Wrapf(errors.New("unable to execute template"), "rendering template has a nested reference name: %s", name)
 			}
+
 			includedNames[name]++
 		} else {
 			includedNames[name] = 1