Merge pull request #296 from scylladb/dk/293-upgrade-scylladb-gocql-t…

…o-newer-version

fix(mod): update packages and golang

.github/workflows/go.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14
+          go-version: 1.20.4
 
       - name: Linting
         run: |

Makefile

@@ -3,7 +3,6 @@ MAKEFILE_PATH := $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
 
 GO111MODULE := on
 # GO_UPGRADE - do not remove this comment, used by scripts/go-upgrade.sh
-GOVERSION ?= 1.12
 GOOS := $(shell uname | tr '[:upper:]' '[:lower:]')
 GOARCH := $(shell go env GOARCH)
 

cmd/gemini/root.go

@@ -17,7 +17,6 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"math"
 	"net/http"
 	_ "net/http/pprof"
@@ -138,7 +137,7 @@ type testJob func(
 ) error
 
 func readSchema(confFile string) (*gemini.Schema, error) {
-	byteValue, err := ioutil.ReadFile(confFile)
+	byteValue, err := os.ReadFile(confFile)
 	if err != nil {
 		return nil, err
 	}

go.mod

@@ -1,33 +1,48 @@
 module github.com/scylladb/gemini
 
-go 1.12
+go 1.20
 
 require (
-	github.com/briandowns/spinner v1.11.1
-	github.com/gocql/gocql v0.0.0-20200131111108-92af2e088537
-	github.com/google/go-cmp v0.4.1
+	github.com/briandowns/spinner v1.23.0
+	github.com/gocql/gocql v0.0.0-20211015133455-b225f9b53fa1
+	github.com/google/go-cmp v0.5.9
 	github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/mitchellh/mapstructure v1.1.2
-	github.com/pkg/errors v0.8.1
-	github.com/prometheus/client_golang v0.9.3
+	github.com/mitchellh/mapstructure v1.5.0
+	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_golang v1.15.0
 	github.com/scylladb/go-set v1.0.2
-	github.com/scylladb/gocqlx/v2 v2.0.2
-	github.com/segmentio/ksuid v1.0.2
-	github.com/spf13/cobra v0.0.3
-	github.com/spf13/pflag v1.0.3 // indirect
-	go.uber.org/atomic v1.4.0 // indirect
-	go.uber.org/multierr v1.1.0
-	go.uber.org/zap v1.10.0
-	golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522
-	golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3
-	golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
-	golang.org/x/sys v0.0.0-20190412213103-97732733099d // indirect
-	gonum.org/v1/gonum v0.0.0-20190724133715-a8659125a966
+	github.com/scylladb/gocqlx/v2 v2.8.0
+	github.com/segmentio/ksuid v1.0.4
+	github.com/spf13/cobra v1.7.0
+	go.uber.org/multierr v1.6.0
+	go.uber.org/zap v1.24.0
+	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
+	golang.org/x/net v0.9.0
+	golang.org/x/sync v0.1.0
+	gonum.org/v1/gonum v0.13.0
 	gopkg.in/inf.v0 v0.9.1
 )
 
-replace (
-	github.com/gocql/gocql => github.com/scylladb/gocql v1.4.0
-	golang.org/x/sync => golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/fatih/color v1.7.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/mattn/go-colorable v0.1.2 // indirect
+	github.com/mattn/go-isatty v0.0.8 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	github.com/scylladb/go-reflectx v1.0.1 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/term v0.7.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 )
+
+replace github.com/gocql/gocql => github.com/scylladb/gocql v1.7.3