Feat/upgrade go version and all dependencies (#67)

* upgrade go and refactor deprecated functions

* fix broken updates

* adjust consul structure

* adjust ci's golang version

* fix broken tests

* gofmt codebase

Author: sillygod

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
       - name: set up go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: '1.16.4'
+          go-version: '1.20'
         id: go
 
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

.github/workflows/pull_request.yml

@@ -19,7 +19,7 @@ jobs:
       - name: set up go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: '1.16.4'
+          go-version: '1.20'
         id: go
 
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       - name: set up go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: '1.16.4'
+          go-version: '1.20'
         id: go
 
       - name: checkout

backends/backend.go

@@ -52,7 +52,7 @@ func (b *Base) Close() error {
 
 // GetReader no reader for base backend
 func (b *Base) GetReader() (io.ReadCloser, error) {
-	return nil, errors.New("Private responses are not readable")
+	return nil, errors.New("private responses are not readable")
 }
 
 // WrapResponseWriterToBackend wrap the responseWriter to match the backend's interface
@@ -61,3 +61,7 @@ func WrapResponseWriterToBackend(w http.ResponseWriter) Backend {
 		w: w,
 	}
 }
+
+var (
+	_ Backend = (*Base)(nil)
+)

backends/backend_test.go

@@ -50,13 +50,6 @@ func (b *BackendTestSuite) TestFlush() {
 	b.Nil(err)
 }
 
-func (b *BackendTestSuite) TestWrapResponseWriterToBackend() {
-	w := httptest.NewRecorder()
-	back := WrapResponseWriterToBackend(w)
-	_, ok := back.(Backend)
-	b.True(ok, "WrapResponseWriterToBackend should make the responseWriter to match the interface of Backend")
-}
-
 func TestBackendTestSuite(t *testing.T) {
 	suite.Run(t, new(BackendTestSuite))
 }

backends/file.go

@@ -2,7 +2,6 @@ package backends
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"sync"
 )
@@ -20,7 +19,7 @@ func NewFileBackend(path string) (Backend, error) {
 		return nil, err
 	}
 
-	file, err := ioutil.TempFile(path, "caddy-cache-")
+	file, err := os.CreateTemp(path, "caddy-cache-")
 	if err != nil {
 		return nil, err
 	}

backends/memory.go

@@ -4,9 +4,7 @@ import (
 	"bytes"
 	"context"
 	"errors"
-	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"sync"
 	"time"
@@ -149,10 +147,6 @@ func NewInMemoryBackend(ctx context.Context, key string, expiration time.Time) (
 	return i, nil
 }
 
-func (i *InMemoryBackend) composeKey(key string, expiration time.Time) string {
-	return fmt.Sprintf("%s:%d", key, expiration.Unix())
-}
-
 // Write adds the response content in the context for the groupcache's
 // setter function.
 func (i *InMemoryBackend) Write(p []byte) (n int, err error) {
@@ -209,6 +203,6 @@ func (i *InMemoryBackend) GetReader() (io.ReadCloser, error) {
 
 	}
 
-	rc := ioutil.NopCloser(bytes.NewReader(i.cachedBytes))
+	rc := io.NopCloser(bytes.NewReader(i.cachedBytes))
 	return rc, nil
 }

backends/memory_test.go

@@ -2,7 +2,7 @@ package backends
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"testing"
 	"time"
 
@@ -40,7 +40,7 @@ func (suite *MemoryBackendTestSuite) TestWriteInCache() {
 	// test the content get from the reader will be consistent with the original one
 	reader, err := backend.GetReader()
 	suite.Nil(err)
-	result, err := ioutil.ReadAll(reader)
+	result, err := io.ReadAll(reader)
 	suite.Nil(err)
 	suite.Equal(result, content)
 }
@@ -64,7 +64,7 @@ func (suite *MemoryBackendTestSuite) TestReadExistingCacheInGroupCache() {
 	reader, err := anotherBackend.GetReader()
 	suite.Assert().NoError(err)
 
-	result, err := ioutil.ReadAll(reader)
+	result, err := io.ReadAll(reader)
 	suite.Assert().NoError(err)
 	suite.Equal(result, content)
 

backends/redis.go

@@ -4,12 +4,11 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"io/ioutil"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/go-redis/redis"
+	"github.com/redis/go-redis/v9"
 )
 
 var (
@@ -61,7 +60,9 @@ func InitRedisClient(addr, password string, db int) error {
 		DB:       db,
 	})
 
-	if _, err := client.Ping().Result(); err != nil {
+	ctx := context.Background()
+
+	if _, err := client.Ping(ctx).Result(); err != nil {
 		return err
 	}
 
@@ -94,23 +95,23 @@ func (r *RedisBackend) Length() int {
 
 // Close write the temp buffer's content to the groupcache
 func (r *RedisBackend) Close() error {
-	_, err := client.Set(r.Key, r.content.Bytes(), r.expiration.Sub(time.Now())).Result()
+	_, err := client.Set(r.Ctx, r.Key, r.content.Bytes(), r.expiration.Sub(time.Now())).Result()
 	return err
 }
 
 // Clean performs the purge storage
 func (r *RedisBackend) Clean() error {
-	_, err := client.Del(r.Key).Result()
+	_, err := client.Del(r.Ctx, r.Key).Result()
 	return err
 }
 
 // GetReader return a reader for the write public response
 func (r *RedisBackend) GetReader() (io.ReadCloser, error) {
-	content, err := client.Get(r.Key).Result()
+	content, err := client.Get(r.Ctx, r.Key).Result()
 	if err != nil {
 		return nil, err
 	}
 
-	rc := ioutil.NopCloser(strings.NewReader(content))
+	rc := io.NopCloser(strings.NewReader(content))
 	return rc, nil
 }

backends/redis_test.go

@@ -3,7 +3,7 @@ package backends
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"testing"
 	"time"
@@ -63,7 +63,7 @@ func (suite *RedisBackendTestSuite) TestWriteCacheInRedis() {
 
 	reader, err := backend.GetReader()
 	suite.Nil(err)
-	result, err := ioutil.ReadAll(reader)
+	result, err := io.ReadAll(reader)
 	suite.Nil(err)
 	suite.Equal(content, result)
 }