From 9120e97ac5ae74926b1dbbc3eb283662abb715cf Mon Sep 17 00:00:00 2001
From: Marina Biryukova <m.biryukova@yadro.com>
Date: Mon, 28 Aug 2023 14:06:46 +0300
Subject: [PATCH] [#203] Add go1.21 to CI

Signed-off-by: Marina Biryukova <m.biryukova@yadro.com>
---
 .docker/Dockerfile               | 2 +-
 .forgejo/workflows/builds.yml    | 2 +-
 .forgejo/workflows/dco.yml       | 2 +-
 .forgejo/workflows/tests.yml     | 4 ++--
 .forgejo/workflows/vulncheck.yml | 2 +-
 Makefile                         | 2 +-
 api/handler/handlers_test.go     | 2 +-
 go.mod                           | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 1fcde85..560e25b 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.19 as builder
+FROM golang:1.21 as builder
 
 ARG BUILD=now
 ARG REPO=git.frostfs.info/TrueCloudLab/frostfs-s3-gw
diff --git a/.forgejo/workflows/builds.yml b/.forgejo/workflows/builds.yml
index 3df5081..aac6857 100644
--- a/.forgejo/workflows/builds.yml
+++ b/.forgejo/workflows/builds.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go_versions: [ '1.19', '1.20' ]
+        go_versions: [ '1.20', '1.21' ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
diff --git a/.forgejo/workflows/dco.yml b/.forgejo/workflows/dco.yml
index f42aa14..a32f978 100644
--- a/.forgejo/workflows/dco.yml
+++ b/.forgejo/workflows/dco.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
 
       - name: Run commit format checker
         uses: https://git.frostfs.info/TrueCloudLab/dco-go@v1
diff --git a/.forgejo/workflows/tests.yml b/.forgejo/workflows/tests.yml
index b9d4ac6..24113a0 100644
--- a/.forgejo/workflows/tests.yml
+++ b/.forgejo/workflows/tests.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           cache: true
 
       - name: Install linters
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go_versions: [ '1.19', '1.20' ]
+        go_versions: [ '1.20', '1.21' ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
diff --git a/.forgejo/workflows/vulncheck.yml b/.forgejo/workflows/vulncheck.yml
index 0c9e908..0139e89 100644
--- a/.forgejo/workflows/vulncheck.yml
+++ b/.forgejo/workflows/vulncheck.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.20'
+          go-version: '1.21'
 
       - name: Install govulncheck
         run: go install golang.org/x/vuln/cmd/govulncheck@latest
diff --git a/Makefile b/Makefile
index 954ffb6..5822bcb 100755
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Common variables
 REPO ?= $(shell go list -m)
 VERSION ?= $(shell git describe --tags --dirty --match "v*" --always --abbrev=8 2>/dev/null || cat VERSION 2>/dev/null || echo "develop")
-GO_VERSION ?= 1.19
+GO_VERSION ?= 1.20
 LINT_VERSION ?= 1.54.0
 TRUECLOUDLAB_LINT_VERSION ?= 0.0.2
 BINDIR = bin
diff --git a/api/handler/handlers_test.go b/api/handler/handlers_test.go
index a6d6b07..f0ebf48 100644
--- a/api/handler/handlers_test.go
+++ b/api/handler/handlers_test.go
@@ -3,9 +3,9 @@ package handler
 import (
 	"bytes"
 	"context"
+	"crypto/rand"
 	"encoding/xml"
 	"io"
-	"math/rand"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
diff --git a/go.mod b/go.mod
index e13f8ea..f3a7512 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module git.frostfs.info/TrueCloudLab/frostfs-s3-gw
 
-go 1.19
+go 1.20
 
 require (
 	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.15.1-0.20230802075510-964c3edb3f44
-- 
2.45.2