Merge pull request #277 from nspcc-dev/262-upgrade-to-go-119

Upgrade to go 119

.github/workflows/builds.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           cache: true
-          go-version: '1.20'
+          go-version: '1.21'
 
       - name: Update Go modules
         run: make dep
@@ -48,7 +48,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           cache: true
-          go-version: '1.20'
+          go-version: '1.21'
 
       - name: Update Go modules
         run: make dep

.github/workflows/tests.yml

@@ -36,7 +36,7 @@ jobs:
         uses: actions/setup-go@v4
         with:
           cache: true
-          go-version: '1.20'
+          go-version: '1.21'
 
       - name: Update Go modules
         run: make dep
@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        go_versions: [ '1.18', '1.19', '1.20' ]
+        go_versions: [ '1.19', '1.20', '1.21' ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine as basebuilder
+FROM golang:1.21-alpine as basebuilder
 RUN apk add --update make bash ca-certificates
 
 FROM basebuilder as builder

Makefile

@@ -2,7 +2,7 @@
 
 REPO ?= $(shell go list -m)
 VERSION ?= $(shell git describe --tags --match "v*" --dirty --always --abbrev=8 2>/dev/null || cat VERSION 2>/dev/null || echo "develop")
-GO_VERSION ?= 1.20
+GO_VERSION ?= 1.21
 LINT_VERSION ?= 1.49.0
 BUILD ?= $(shell date -u --iso=seconds)
 

downloader/download.go

@@ -13,6 +13,7 @@ import (
 	"path"
 	"strconv"
 	"strings"
+	"sync/atomic"
 	"time"
 	"unicode"
 	"unicode/utf8"
@@ -31,7 +32,6 @@ import (
 	"github.com/nspcc-dev/neofs-sdk-go/pool"
 	"github.com/nspcc-dev/neofs-sdk-go/user"
 	"github.com/valyala/fasthttp"
-	"go.uber.org/atomic"
 	"go.uber.org/zap"
 )
 

go.mod

@@ -1,11 +1,11 @@
 module github.com/nspcc-dev/neofs-http-gw
 
-go 1.18
+go 1.19
 
 require (
 	github.com/docker/docker v24.0.5+incompatible
 	github.com/fasthttp/router v1.4.1
-	github.com/nspcc-dev/neo-go v0.101.0
+	github.com/nspcc-dev/neo-go v0.102.0
 	github.com/nspcc-dev/neofs-contract v0.17.1-0.20230804121740-84ff5d244f69
 	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.11.0.20230912200451-c0eefd5bd81c
 	github.com/prometheus/client_golang v1.14.0
@@ -14,7 +14,6 @@ require (
 	github.com/stretchr/testify v1.8.4
 	github.com/testcontainers/testcontainers-go v0.22.0
 	github.com/valyala/fasthttp v1.34.0
-	go.uber.org/atomic v1.10.0
 	go.uber.org/zap v1.24.0
 )
 
@@ -77,6 +76,7 @@ require (
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/urfave/cli v1.22.12 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/goleak v1.1.12 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/crypto v0.12.0 // indirect

go.sum

@@ -304,8 +304,8 @@ github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22 h1:n4ZaF
 github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22/go.mod h1:79bEUDEviBHJMFV6Iq6in57FEOCMcRhfQnfaf0ETA5U=
 github.com/nspcc-dev/hrw v1.0.9 h1:17VcAuTtrstmFppBjfRiia4K2wA/ukXZhLFS8Y8rz5Y=
 github.com/nspcc-dev/hrw v1.0.9/go.mod h1:l/W2vx83vMQo6aStyx2AuZrJ+07lGv2JQGlVkPG06MU=
-github.com/nspcc-dev/neo-go v0.101.0 h1:JPT2DpZqVjho34TMR59dm6uxvCFttOp02Nm8qCjpfaU=
-github.com/nspcc-dev/neo-go v0.101.0/go.mod h1:Q0uWKivGc2mYgdKFmTNP49LeXwMu4x6pUzHm3OIsN2I=
+github.com/nspcc-dev/neo-go v0.102.0 h1:O2Gt4JPOWmp0c+PnPWwd2wPI74BKSwkaNCEyvyQTWJw=
+github.com/nspcc-dev/neo-go v0.102.0/go.mod h1:QXxpZxJT2KedwM0Nlj8UO0/fZN2WIe4h/i03uBHKbnc=
 github.com/nspcc-dev/neofs-api-go/v2 v2.14.0 h1:jhuN8Ldqz7WApvUJRFY0bjRXE1R3iCkboMX5QVZhHVk=
 github.com/nspcc-dev/neofs-api-go/v2 v2.14.0/go.mod h1:DRIr0Ic1s+6QgdqmNFNLIqMqd7lNMJfYwkczlm1hDtM=
 github.com/nspcc-dev/neofs-contract v0.17.1-0.20230804121740-84ff5d244f69 h1:Vw7WvLxWUwFGDyTnE+x/L8+N7Oo6q9WyRy8YH60juM4=

uploader/upload.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"net/http"
 	"strconv"
+	"sync/atomic"
 	"time"
 
 	"github.com/nspcc-dev/neofs-http-gw/resolver"
@@ -21,7 +22,6 @@ import (
 	"github.com/nspcc-dev/neofs-sdk-go/pool"
 	"github.com/nspcc-dev/neofs-sdk-go/user"
 	"github.com/valyala/fasthttp"
-	"go.uber.org/atomic"
 	"go.uber.org/zap"
 )