Resolve "upgrage to 1.17"

dbeleon · Feb 10, 2022 · daa02c8 · daa02c8
1 parent eeb0abd
commit daa02c8
Show file tree

Hide file tree

Showing 156 changed files with 357 additions and 58 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -40,17 +40,20 @@ linters-settings:
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes
     local-prefixes: gitlab.com
+  stylecheck:
+    # https://staticcheck.io/docs/options#checks
+    checks: ["all", "-ST1018"]
 
 linters:
   disable-all: true
   enable:
     - errcheck
     - gofmt
-    - golint
+    - stylecheck
     - gosimple
     - govet
     - ineffassign
-    - scopelint
+    - exportloopref
     - staticcheck
     - typecheck
     - unconvert

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Курс по Го в ШАД
 
-Для работы с кодом нужен go 1.16 или выше.
+Для работы с кодом нужен go 1.17 или выше.
 
 ```sh
 git clone https://gitlab.com/slon/shad-go.git

diff --git a/allocs/allocs.go b/allocs/allocs.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package allocs
@@ -6,4 +7,4 @@ package allocs
 
 func NewEnhancedCounter() Counter {
 	return NewBaselineCounter()
-}
+}
diff --git a/allocs/baseline.go b/allocs/baseline.go
@@ -1,5 +1,5 @@
-// +build !solution
-// +build !change
+//go:build !solution && !change
+// +build !solution,!change
 
 package allocs
 

diff --git a/batcher/batcher.go b/batcher/batcher.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package batcher

diff --git a/batcher/batcher_race_test.go b/batcher/batcher_race_test.go
@@ -1,4 +1,5 @@
-//+build race
+//go:build race
+// +build race
 
 package batcher
 

diff --git a/batcher/slow/value.go b/batcher/slow/value.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package slow

diff --git a/blowfish/blowfish.go b/blowfish/blowfish.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package blowfish

diff --git a/build.docker b/build.docker
@@ -1,10 +1,10 @@
-FROM golang:1.16
+FROM golang:1.17
 
 RUN apt-get update && apt-get install -y \
     rsync libssl-dev \
  && rm -rf /var/lib/apt/lists/*
 
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.23.6
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.44.0
 RUN curl -L "https://github.com/docker/compose/releases/download/1.28.5/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 RUN chmod +x /usr/local/bin/docker-compose
 RUN curl -fsSL https://get.docker.com | sh
diff --git a/ciletters/letter.go b/ciletters/letter.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package ciletters

diff --git a/ciletters/notification.go b/ciletters/notification.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package ciletters

diff --git a/cond/cond.go b/cond/cond.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package cond

diff --git a/coverme/app/app.go b/coverme/app/app.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package app

diff --git a/coverme/app/coverage_test.go b/coverme/app/coverage_test.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package app

diff --git a/coverme/client/client.go b/coverme/client/client.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package client

diff --git a/coverme/main.go b/coverme/main.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package main

diff --git a/coverme/models/storage.go b/coverme/models/storage.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package models

diff --git a/coverme/models/todo.go b/coverme/models/todo.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package models

diff --git a/coverme/utils/httputils.go b/coverme/utils/httputils.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package utils

diff --git a/digitalclock/main.go b/digitalclock/main.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package main

diff --git a/digitalclock/symbols.go b/digitalclock/symbols.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package main

diff --git a/distbuild/pkg/api/build_client.go b/distbuild/pkg/api/build_client.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package api

diff --git a/distbuild/pkg/api/build_handler.go b/distbuild/pkg/api/build_handler.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package api

diff --git a/distbuild/pkg/api/heartbeat_client.go b/distbuild/pkg/api/heartbeat_client.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package api

diff --git a/distbuild/pkg/api/heartbeat_handler.go b/distbuild/pkg/api/heartbeat_handler.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package api

diff --git a/distbuild/pkg/artifact/cache.go b/distbuild/pkg/artifact/cache.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package artifact

diff --git a/distbuild/pkg/artifact/client.go b/distbuild/pkg/artifact/client.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package artifact

diff --git a/distbuild/pkg/artifact/handler.go b/distbuild/pkg/artifact/handler.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package artifact

diff --git a/distbuild/pkg/client/build.go b/distbuild/pkg/client/build.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package client

diff --git a/distbuild/pkg/dist/coordinator.go b/distbuild/pkg/dist/coordinator.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package dist

diff --git a/distbuild/pkg/filecache/client.go b/distbuild/pkg/filecache/client.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package filecache

diff --git a/distbuild/pkg/filecache/filecache.go b/distbuild/pkg/filecache/filecache.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package filecache

diff --git a/distbuild/pkg/filecache/handler.go b/distbuild/pkg/filecache/handler.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package filecache

diff --git a/distbuild/pkg/scheduler/scheduler.go b/distbuild/pkg/scheduler/scheduler.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package scheduler

diff --git a/distbuild/pkg/tarstream/stream.go b/distbuild/pkg/tarstream/stream.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package tarstream

diff --git a/distbuild/pkg/worker/worker.go b/distbuild/pkg/worker/worker.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package worker

diff --git a/dupcall/dupcall.go b/dupcall/dupcall.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package dupcall

diff --git a/externalsort/io.go b/externalsort/io.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package externalsort

diff --git a/externalsort/sort.go b/externalsort/sort.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package externalsort

diff --git a/fetchall/main.go b/fetchall/main.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package main

diff --git a/fetchall/main_test.go b/fetchall/main_test.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package main

diff --git a/fileleak/fileleak.go b/fileleak/fileleak.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package fileleak
@@ -9,4 +10,4 @@ type testingT interface {
 
 func VerifyNone(t testingT) {
 	panic("implement me")
-} 
+}
diff --git a/firewall/cmd/firewall/main.go b/firewall/cmd/firewall/main.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package main

diff --git a/firewall/cmd/service/main.go b/firewall/cmd/service/main.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package main

diff --git a/foolsday2/flag_test.go b/foolsday2/flag_test.go
@@ -1,4 +1,4 @@
-// +build private
+//go:build private
 
 package main
 

diff --git a/foolsday3/lambda.go b/foolsday3/lambda.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package foolsday3

diff --git a/foolsday3/lambda_test.go b/foolsday3/lambda_test.go
@@ -1,3 +1,4 @@
+//go:build !race
 // +build !race
 
 package foolsday3

diff --git a/foolsday3/solution.go b/foolsday3/solution.go
@@ -1,3 +1,4 @@
+//go:build solution
 // +build solution
 
 package foolsday3

diff --git a/forth/eval.go b/forth/eval.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package main

diff --git a/forth/main.go b/forth/main.go
@@ -1,3 +1,4 @@
+//go:build !change
 // +build !change
 
 package main

diff --git a/gitfame/cmd/gitfame/main.go b/gitfame/cmd/gitfame/main.go
@@ -1,3 +1,4 @@
+//go:build !solution
 // +build !solution
 
 package main

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module gitlab.com/slon/shad-go
 
-go 1.16
+go 1.17
 
 require (
 	github.com/ClickHouse/clickhouse-go v1.4.0
@@ -9,11 +9,12 @@ require (
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/go-redis/redis v6.15.9+incompatible
 	github.com/go-redis/redis/v7 v7.4.0
+	github.com/go-redis/redis/v8 v8.11.4
 	github.com/go-resty/resty/v2 v2.1.0
 	github.com/gofrs/uuid v3.2.0+incompatible
 	github.com/golang/mock v1.4.1
 	github.com/gomodule/redigo v1.8.4
-	github.com/google/go-cmp v0.4.0
+	github.com/google/go-cmp v0.5.6
 	github.com/google/uuid v1.2.0
 	github.com/gorilla/handlers v1.4.2
 	github.com/gorilla/mux v1.7.4
@@ -30,12 +31,70 @@ require (
 	go.etcd.io/bbolt v1.3.2
 	go.uber.org/goleak v1.0.0
 	go.uber.org/zap v1.14.0
-	golang.org/x/net v0.0.0-20190923162816-aa69164e4478
+	golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f
 	golang.org/x/perf v0.0.0-20191209155426-36b577b0eb03
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa
-	golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	golang.org/x/sys v0.0.0-20220209214540-3681064d5158
+	golang.org/x/tools v0.1.9
 	gopkg.in/src-d/go-git.v4 v4.13.1
 	gopkg.in/yaml.v2 v2.4.0
 	gopl.io v0.0.0-20200323155855-65c318dde95e
 )
+
+require (
+	github.com/BurntSushi/toml v0.3.1 // indirect
+	github.com/Microsoft/go-winio v0.4.11 // indirect
+	github.com/Microsoft/hcsshim v0.8.6 // indirect
+	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect
+	github.com/containerd/containerd v1.4.1 // indirect
+	github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible // indirect
+	github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-units v0.3.3 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
+	github.com/gogo/protobuf v1.2.1 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
+	github.com/jackc/pgconn v1.5.0 // indirect
+	github.com/jackc/pgio v1.0.0 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgproto3/v2 v2.0.1 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8 // indirect
+	github.com/jackc/pgtype v1.3.0 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
+	github.com/opencontainers/image-spec v1.0.1 // indirect
+	github.com/opencontainers/runc v0.1.1 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/sergi/go-diff v1.0.0 // indirect
+	github.com/sirupsen/logrus v1.4.2 // indirect
+	github.com/src-d/gcfg v1.4.0 // indirect
+	github.com/xanzy/ssh-agent v0.2.1 // indirect
+	github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da // indirect
+	go.uber.org/atomic v1.5.0 // indirect
+	go.uber.org/multierr v1.3.0 // indirect
+	go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee // indirect
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
+	golang.org/x/lint v0.0.0-20190930215403-16217165b5de // indirect
+	golang.org/x/mod v0.5.1 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a // indirect
+	google.golang.org/grpc v1.21.1 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
+	gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+	honnef.co/go/tools v0.0.1-2019.2.3 // indirect
+)