Build with Go 1.21rc3 (#511)

* Build with Go 1.21rc3

* Fix usage of slog

.github/workflows/goreleaser-run.yml

@@ -20,7 +20,7 @@ jobs:
 
       - uses: actions/[email protected]
         with:
-          go-version: "1.20"
+          go-version: "1.21.0-rc.3"
 
       - uses: goreleaser/[email protected]
         env:

.github/workflows/goreleaser-test.yml

@@ -19,7 +19,7 @@ jobs:
 
       - uses: actions/[email protected]
         with:
-          go-version: "1.20"
+          go-version: "1.21.0-rc.3"
 
       - uses: goreleaser/[email protected]
         with:

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/[email protected]
         with:
-          go-version: "1.20"
+          go-version: "1.21.0-rc.3"
 
       - name: run-tests
         run: go test -race -vet all ./...
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/[email protected]
         id: setup-go
         with:
-          go-version: "1.20"
+          go-version: "1.21.0-rc.3"
 
       - run: |
           go install honnef.co/go/tools/cmd/staticcheck@master

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20.6-alpine AS build
+FROM golang:1.21rc3-alpine AS build
 
 ENV CGO_ENABLED 0
 WORKDIR /code

go.mod

@@ -3,12 +3,11 @@ module github.com/fsouza/s3-upload-proxy
 require (
 	github.com/aws/aws-sdk-go v1.44.300
 	github.com/kelseyhightower/envconfig v1.4.0
-	golang.org/x/exp v0.0.0-20221114191408-850992195362
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 )
 
-go 1.20
+go 1.21

go.sum

@@ -16,8 +16,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/exp v0.0.0-20221114191408-850992195362 h1:NoHlPRbyl1VFI6FjwHtPQCN7wAMXI6cKcqrmXhOOfBQ=
-golang.org/x/exp v0.0.0-20221114191408-850992195362/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=

main.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"log/slog"
 	"mime"
 	"net"
 	"net/http"
@@ -21,7 +22,6 @@ import (
 	"github.com/fsouza/s3-upload-proxy/internal/uploader/mediastore"
 	"github.com/fsouza/s3-upload-proxy/internal/uploader/s3"
 	"github.com/kelseyhightower/envconfig"
-	"golang.org/x/exp/slog"
 )
 
 // Config is the configuration of the s3-uploader.
@@ -62,14 +62,14 @@ func (c *Config) uploader() (uploader.Uploader, error) {
 
 func (c *Config) logger() *slog.Logger {
 	levels := map[string]slog.Level{
-		"debug":   slog.DebugLevel,
-		"info":    slog.InfoLevel,
-		"warning": slog.WarnLevel,
-		"warn":    slog.WarnLevel,
-		"error":   slog.ErrorLevel,
+		"debug":   slog.LevelDebug,
+		"info":    slog.LevelInfo,
+		"warning": slog.LevelWarn,
+		"warn":    slog.LevelWarn,
+		"error":   slog.LevelError,
 	}
 	opts := slog.HandlerOptions{Level: levels[c.LogLevel]}
-	return slog.New(opts.NewTextHandler(os.Stderr))
+	return slog.New(slog.NewTextHandler(os.Stderr, &opts))
 }
 
 func healthcheck(w http.ResponseWriter, r *http.Request) {