feat(deps): bump golangci-lint CI version

Author: darkweak

.github/workflows/ci.yml

@@ -17,18 +17,18 @@ jobs:
         # The Windows build currently fail because of https://github.com/golang/go/issues/40795, and because xcaddy isn't compatible with the known workaround
         #os: [ ubuntu-latest, macos-latest, windows-latest ]
         os: [ ubuntu-latest, macos-latest ]
-        go: [ '1.21' ]
+        go: [ '1.24' ]
 
     runs-on: ${{ matrix.os }}
 
     steps:
     - name: Install Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
 
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Print Go version and environment
       id: vars
@@ -44,7 +44,7 @@ jobs:
         echo "::set-output name=go_cache::$(go env GOCACHE)"
 
     - name: Cache the build cache
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ${{ steps.vars.outputs.go_cache }}
         key: ${{ runner.os }}-${{ matrix.go }}-go-ci-${{ hashFiles('**/go.sum') }}
@@ -71,11 +71,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.24'
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v8
         with:
           args: --timeout 5m

cleaner.go

@@ -21,8 +21,8 @@ func newStorageProvider() *storage_providers {
 }
 
 func (s *storage_providers) Add(key interface{}) {
-	s.RWMutex.Lock()
-	defer s.RWMutex.Unlock()
+	s.Lock()
+	defer s.Unlock()
 
 	s.list[key] = true
 }

configuration.go

@@ -321,11 +321,12 @@ func parseRedisConfiguration(c map[string]interface{}) map[string]interface{} {
 		case "SendToReplicas", "ShuffleInit", "ClientNoTouch", "DisableRetry", "DisableCache", "AlwaysPipelining", "AlwaysRESP2", "ForceSingleClient", "ReplicaOnly", "ClientNoEvict", "ContextTimeoutEnabled", "PoolFIFO", "ReadOnly", "RouteByLatency", "RouteRandomly", "DisableIndentity":
 			c[k] = true
 		case "SelectDB", "CacheSizeEachConn", "RingScaleEachConn", "ReadBufferEachConn", "WriteBufferEachConn", "BlockingPoolSize", "PipelineMultiplex", "DB", "Protocol", "MaxRetries", "PoolSize", "MinIdleConns", "MaxIdleConns", "MaxActiveConns", "MaxRedirects":
-			if v == false {
+			switch v {
+			case false:
 				c[k] = 0
-			} else if v == true {
+			case true:
 				c[k] = 1
-			} else {
+			default:
 				c[k], _ = strconv.Atoi(v.(string))
 			}
 		case "ConnWriteTimeout", "MaxFlushDelay", "MinRetryBackoff", "MaxRetryBackoff", "DialTimeout", "ReadTimeout", "WriteTimeout", "PoolTimeout", "ConnMaxIdleTime", "ConnMaxLifetime":
@@ -362,19 +363,21 @@ func parseSimpleFSConfiguration(c map[string]interface{}) map[string]interface{}
 		case "path":
 			c[k] = v
 		case "size":
-			if v == false {
+			switch v {
+			case false:
 				c[k] = 0
-			} else if v == true {
+			case true:
 				c[k] = 1
-			} else {
+			default:
 				c[k], _ = strconv.Atoi(v.(string))
 			}
 		case "directory_size":
-			if v == false {
+			switch v {
+			case false:
 				c[k] = 0
-			} else if v == true {
+			case true:
 				c[k] = 1
-			} else {
+			default:
 				c[k], _ = strconv.Atoi(v.(string))
 			}
 		}

httpcache.go

@@ -136,16 +136,16 @@ func (s *SouinCaddyMiddleware) FromApp(app *SouinApp) error {
 		}
 	}
 
-	if app.DefaultCache.GetTTL() == 0 {
+	if app.GetTTL() == 0 {
 		if s.Configuration.DefaultCache.GetTTL() == 0 {
-			app.DefaultCache.TTL = configurationtypes.Duration{Duration: 120 * time.Second}
+			app.TTL = configurationtypes.Duration{Duration: 120 * time.Second}
 		}
 	}
 
 	if s.Configuration.GetDefaultCache() == nil {
 		s.Configuration.DefaultCache = DefaultCache{
-			AllowedHTTPVerbs:             app.DefaultCache.AllowedHTTPVerbs,
-			AllowedAdditionalStatusCodes: app.DefaultCache.AllowedAdditionalStatusCodes,
+			AllowedHTTPVerbs:             app.AllowedHTTPVerbs,
+			AllowedAdditionalStatusCodes: app.AllowedAdditionalStatusCodes,
 			Headers:                      app.Headers,
 			Key:                          app.Key,
 			TTL:                          app.TTL,
@@ -156,7 +156,7 @@ func (s *SouinCaddyMiddleware) FromApp(app *SouinApp) error {
 		}
 		return nil
 	}
-	if s.Configuration.CacheKeys == nil || len(s.Configuration.CacheKeys) == 0 {
+	if len(s.Configuration.CacheKeys) == 0 {
 		s.Configuration.CacheKeys = configurationtypes.CacheKeys{}
 	}
 	if s.CacheKeys == nil {
@@ -175,7 +175,7 @@ func (s *SouinCaddyMiddleware) FromApp(app *SouinApp) error {
 	appDc := app.DefaultCache
 	s.Configuration.DefaultCache.AllowedHTTPVerbs = append(s.Configuration.DefaultCache.AllowedHTTPVerbs, appDc.AllowedHTTPVerbs...)
 	s.Configuration.DefaultCache.AllowedAdditionalStatusCodes = append(s.Configuration.DefaultCache.AllowedAdditionalStatusCodes, appDc.AllowedAdditionalStatusCodes...)
-	s.Configuration.DefaultCache.CDN = app.DefaultCache.CDN
+	s.Configuration.DefaultCache.CDN = app.CDN
 	if dc.Headers == nil {
 		s.Configuration.DefaultCache.Headers = appDc.Headers
 	}
@@ -278,9 +278,9 @@ func (s *SouinCaddyMiddleware) Provision(ctx caddy.Context) error {
 	}
 
 	if app.SurrogateStorage == (surrogates_providers.SurrogateInterface)(nil) {
-		app.SurrogateStorage = s.SouinBaseHandler.SurrogateKeyStorer
+		app.SurrogateStorage = s.SurrogateKeyStorer
 	} else {
-		s.SouinBaseHandler.SurrogateKeyStorer = app.SurrogateStorage
+		s.SurrogateKeyStorer = app.SurrogateStorage
 	}
 
 	return nil

httpcache_test.go

@@ -480,7 +480,8 @@ func TestAuthenticatedRoute(t *testing.T) {
 		t.Errorf("unexpected Cache-Status header %v", respAuthBypassAlice1.Header.Get("Cache-Status"))
 	}
 	respAuthBypassAlice2, _ := tester.AssertResponse(getRequestFor("/auth-bypass", "Alice"), 200, "Hello, auth bypass Bearer Alice!")
-	if respAuthBypassAlice2.Header.Get("Cache-Status") != "Souin; hit; ttl=4; key=GET-http-localhost:9080-/auth-bypass-Bearer Alice-text/plain; detail=DEFAULT" {
+	if respAuthBypassAlice2.Header.Get("Cache-Status") != "Souin; hit; ttl=4; key=GET-http-localhost:9080-/auth-bypass-Bearer Alice-text/plain; detail=DEFAULT" &&
+		respAuthBypassAlice2.Header.Get("Cache-Status") != "Souin; hit; ttl=3; key=GET-http-localhost:9080-/auth-bypass-Bearer Alice-text/plain; detail=DEFAULT" {
 		t.Errorf("unexpected Cache-Status header %v", respAuthBypassAlice2.Header.Get("Cache-Status"))
 	}
 
@@ -489,7 +490,8 @@ func TestAuthenticatedRoute(t *testing.T) {
 		t.Errorf("unexpected Cache-Status header %v", respAuthBypassBob1.Header.Get("Cache-Status"))
 	}
 	respAuthBypassBob2, _ := tester.AssertResponse(getRequestFor("/auth-bypass", "Bob"), 200, "Hello, auth bypass Bearer Bob!")
-	if respAuthBypassBob2.Header.Get("Cache-Status") != "Souin; hit; ttl=4; key=GET-http-localhost:9080-/auth-bypass-Bearer Bob-text/plain; detail=DEFAULT" {
+	if respAuthBypassBob2.Header.Get("Cache-Status") != "Souin; hit; ttl=4; key=GET-http-localhost:9080-/auth-bypass-Bearer Bob-text/plain; detail=DEFAULT" &&
+		respAuthBypassBob2.Header.Get("Cache-Status") != "Souin; hit; ttl=3; key=GET-http-localhost:9080-/auth-bypass-Bearer Bob-text/plain; detail=DEFAULT" {
 		t.Errorf("unexpected Cache-Status header %v", respAuthBypassBob2.Header.Get("Cache-Status"))
 	}
 
@@ -498,7 +500,8 @@ func TestAuthenticatedRoute(t *testing.T) {
 		t.Errorf("unexpected Cache-Status header %v", respAuthVaryBypassAlice1.Header.Get("Cache-Status"))
 	}
 	respAuthVaryBypassAlice2, _ := tester.AssertResponse(getRequestFor("/auth-bypass-vary", "Alice"), 200, "Hello, auth vary bypass Bearer Alice!")
-	if respAuthVaryBypassAlice2.Header.Get("Cache-Status") != "Souin; hit; ttl=4; key=GET-http-localhost:9080-/auth-bypass-vary-Bearer Alice-text/plain; detail=DEFAULT" {
+	if respAuthVaryBypassAlice2.Header.Get("Cache-Status") != "Souin; hit; ttl=4; key=GET-http-localhost:9080-/auth-bypass-vary-Bearer Alice-text/plain; detail=DEFAULT" &&
+		respAuthVaryBypassAlice2.Header.Get("Cache-Status") != "Souin; hit; ttl=3; key=GET-http-localhost:9080-/auth-bypass-vary-Bearer Alice-text/plain; detail=DEFAULT" {
 		t.Errorf("unexpected Cache-Status header %v", respAuthVaryBypassAlice2.Header.Get("Cache-Status"))
 	}
 }
@@ -820,7 +823,7 @@ func (t *testVaryHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Vary", variedHeader)
 	w.Header().Set(variedHeader, r.Header.Get(variedHeader))
 	w.WriteHeader(http.StatusOK)
-	_, _ = w.Write([]byte(fmt.Sprintf("Hello, vary %s!", r.Header.Get(variedHeader))))
+	_, _ = fmt.Fprintf(w, "Hello, vary %s!", r.Header.Get(variedHeader))
 }
 
 func TestVaryHandler(t *testing.T) {
@@ -1178,7 +1181,8 @@ func TestExpires(t *testing.T) {
 			t.Errorf("unexpected Age header %v", resp1.Header.Get("Age"))
 		}
 
-		if resp1.Header.Get("Cache-Status") != fmt.Sprintf("Souin; hit; ttl=%d; key=GET-http-localhost:9080-%s; detail=DEFAULT", expectedDuration, path) {
+		if resp1.Header.Get("Cache-Status") != fmt.Sprintf("Souin; hit; ttl=%d; key=GET-http-localhost:9080-%s; detail=DEFAULT", expectedDuration, path) &&
+			resp1.Header.Get("Cache-Status") != fmt.Sprintf("Souin; hit; ttl=%d; key=GET-http-localhost:9080-%s; detail=DEFAULT", expectedDuration-1, path) {
 			t.Errorf(
 				"unexpected second Cache-Status header %v, expected %s",
 				resp1.Header.Get("Cache-Status"),