From daa02c8abf853c382bf7e78ff78714e19f4a4b4b Mon Sep 17 00:00:00 2001 From: verytable Date: Thu, 10 Feb 2022 22:06:57 +0000 Subject: [PATCH] Resolve "upgrage to 1.17" --- .golangci.yml | 7 +- README.md | 2 +- allocs/allocs.go | 3 +- allocs/baseline.go | 4 +- batcher/batcher.go | 1 + batcher/batcher_race_test.go | 3 +- batcher/slow/value.go | 1 + blowfish/blowfish.go | 1 + build.docker | 4 +- ciletters/letter.go | 1 + ciletters/notification.go | 1 + cond/cond.go | 1 + coverme/app/app.go | 1 + coverme/app/coverage_test.go | 1 + coverme/client/client.go | 1 + coverme/main.go | 1 + coverme/models/storage.go | 1 + coverme/models/todo.go | 1 + coverme/utils/httputils.go | 1 + digitalclock/main.go | 1 + digitalclock/symbols.go | 1 + distbuild/pkg/api/build_client.go | 1 + distbuild/pkg/api/build_handler.go | 1 + distbuild/pkg/api/heartbeat_client.go | 1 + distbuild/pkg/api/heartbeat_handler.go | 1 + distbuild/pkg/artifact/cache.go | 1 + distbuild/pkg/artifact/client.go | 1 + distbuild/pkg/artifact/handler.go | 1 + distbuild/pkg/client/build.go | 1 + distbuild/pkg/dist/coordinator.go | 1 + distbuild/pkg/filecache/client.go | 1 + distbuild/pkg/filecache/filecache.go | 1 + distbuild/pkg/filecache/handler.go | 1 + distbuild/pkg/scheduler/scheduler.go | 1 + distbuild/pkg/tarstream/stream.go | 1 + distbuild/pkg/worker/worker.go | 1 + dupcall/dupcall.go | 1 + externalsort/io.go | 1 + externalsort/sort.go | 1 + fetchall/main.go | 1 + fetchall/main_test.go | 1 + fileleak/fileleak.go | 3 +- firewall/cmd/firewall/main.go | 1 + firewall/cmd/service/main.go | 1 + foolsday2/flag_test.go | 2 +- foolsday3/lambda.go | 1 + foolsday3/lambda_test.go | 1 + foolsday3/solution.go | 1 + forth/eval.go | 1 + forth/main.go | 1 + gitfame/cmd/gitfame/main.go | 1 + go.mod | 71 ++++++++++++-- go.sum | 95 +++++++++++++++---- hogwarts/courselist.go | 1 + hotelbusiness/hotels.go | 1 + illegal/field.go | 1 + illegal/internal/struct.go | 1 + illegal/string.go | 1 + jsonlist/jsonlist.go | 1 + jsonrpc/jsonrpc.go | 1 + keylock/keylock.go | 1 + lectures/07-sql/conf/stats.go | 2 + lrucache/cache.go | 1 + lrucache/lru.go | 1 + olympics/main.go | 1 + once/once.go | 1 + otp/cipher.go | 1 + pubsub/my_pubsub.go | 1 + pubsub/pubsub.go | 1 + ratelimit/ratelimit.go | 1 + retryupdate/kvapi/api.go | 1 + retryupdate/kvapi/errors.go | 1 + retryupdate/update.go | 1 + reversemap/reversemap.go | 1 + rwmutex/rwmutex.go | 1 + speller/speller.go | 1 + structtags/structtags.go | 1 + sum/sum.go | 1 + tabletest/coverage_test.go | 1 + tabletest/parse_duration.go | 1 + testequal/assertions.go | 1 + testequal/t.go | 1 + testifycheck/testifycheck.go | 1 + tools/testtool/buildtags.go | 1 + tools/testtool/commands/test_submission.go | 3 +- .../correct/coverme/private/.golangci.yml | 7 +- .../coverme/private/coverme/coverage_test.go | 1 + .../coverme/private/coverme/service.go | 1 + .../coverme/private/coverme/solution_test.go | 1 + .../coverme/private/coverme/subpkg/f.go | 1 + .../coverme/student/coverme/coverage_test.go | 1 + .../coverme/student/coverme/service.go | 1 + .../coverme/student/coverme/subpkg/f.go | 1 + .../cumulativecoverage/private/.golangci.yml | 7 +- .../cumulativecoverage/big/solution_test.go | 1 + .../cumulativecoverage/small/solution_test.go | 1 + .../correct/sum/private/.golangci.yml | 7 +- .../correct/sum/private/sum/sum.go | 1 + .../sum/private/sum/sum_private_test.go | 1 + .../correct/sum/private/sum/sum_solution.go | 1 + .../correct/sum/private/sum/summer.go | 1 + .../correct/sum/student/sum/sum.go | 1 + .../badbenchmark/private/.golangci.yml | 7 +- .../badbenchmark/private/badbenchmark/sum.go | 1 + .../private/badbenchmark/sum_solution.go | 1 + .../badbenchmark/student/badbenchmark/sum.go | 1 + .../brokenstyle/private/.golangci.yml | 7 +- .../brokenstyle/private/brokenstyle/sum.go | 1 + .../private/brokenstyle/sum_private_test.go | 1 + .../private/brokenstyle/sum_solution.go | 1 + .../brokenstyle/student/brokenstyle/sum.go | 1 + .../brokentest/private/.golangci.yml | 7 +- .../brokentest/private/brokentest/sum.go | 1 + .../private/brokentest/sum_private_test.go | 1 + .../private/brokentest/sum_solution.go | 1 + .../brokentest/student/brokentest/sum.go | 1 + .../extracoverage/private/.golangci.yml | 7 +- .../private/extracoverage/coverage_test.go | 1 + .../private/extracoverage/service.go | 1 + .../private/extracoverage/solution_test.go | 1 + .../extracoverage/student/.golangci.yml | 7 +- .../student/extracoverage/coverage_test.go | 1 + .../student/extracoverage/service.go | 1 + .../newdependency/private/.golangci.yml | 7 +- .../private/newdependency/sum.go | 1 + .../private/newdependency/sum_private_test.go | 1 + .../private/newdependency/sum_solution.go | 1 + .../student/newdependency/sum.go | 1 + .../poorcoverage/private/.golangci.yml | 7 +- .../private/poorcoverage/coverage_test.go | 1 + .../private/poorcoverage/service.go | 1 + .../private/poorcoverage/solution_test.go | 1 + .../student/poorcoverage/coverage_test.go | 1 + .../student/poorcoverage/service.go | 1 + .../skippedcoverpkg/private/.golangci.yml | 7 +- .../private/skippedcoverpkg/coverage_test.go | 1 + .../skippedcoverpkg/product/product.go | 1 + .../skippedcoverpkg/product/solution_test.go | 1 + .../skippedcoverpkg/sum/solution_test.go | 1 + .../private/skippedcoverpkg/sum/sum.go | 1 + .../skippedcoverpkg/student/.golangci.yml | 7 +- .../student/skippedcoverpkg/coverage_test.go | 1 + .../skippedcoverpkg/product/product.go | 1 + .../student/skippedcoverpkg/sum/sum.go | 1 + tparallel/tparallel.go | 1 + urlfetch/main.go | 1 + urlfetch/main_test.go | 1 + urlshortener/main.go | 1 + utf8/reverse/reverse.go | 1 + utf8/spacecollapse/collapse.go | 1 + varfmt/fmt.go | 1 + varjoin/join.go | 1 + waitgroup/waitgroup.go | 1 + wordcount/main.go | 1 + wordcount/main_test.go | 1 + wscat/main.go | 1 + 156 files changed, 357 insertions(+), 58 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 4b4d4be..207bcb7 100644 --- 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 index 1806a30..8e1c420 100644 --- 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 index 71fc8aa..86fa416 100644 --- 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() -} \ No newline at end of file +} diff --git a/allocs/baseline.go b/allocs/baseline.go index bb18838..402aef7 100644 --- 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 index b82cfa4..7cc4901 100644 --- 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 index c4c540d..0f361a6 100644 --- 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 index 5c0e585..00f7f48 100644 --- 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 index 5584c18..28a055f 100644 --- 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 index 9c9ead5..1bd7e70 100644 --- 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 index d3424fc..c5246ad 100644 --- 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 index 131aa5b..61978e4 100644 --- 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 index 8178f76..4d74c93 100644 --- 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 index 470c54b..c9387cd 100644 --- 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 index c33daf0..66b10f5 100644 --- 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 index 98357ed..cac5a08 100644 --- 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 index 71478c5..2c97450 100644 --- 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 index 59b029f..07185ee 100644 --- 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 index fc6d8b1..80ce420 100644 --- 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 index d1a7ede..f052723 100644 --- 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 index cab7d3a..375bf63 100644 --- 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 index 8578102..6593e32 100644 --- 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 index 399b6ea..77661a2 100644 --- 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 index fd08441..a682d15 100644 --- 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 index 53f154e..7306b93 100644 --- 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 index 8f4a4b7..a475d2d 100644 --- 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 index eaa3b8f..a328cf8 100644 --- 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 index 7b77298..057ed7d 100644 --- 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 index 8997520..e12059f 100644 --- 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 index 0f77a32..7a34487 100644 --- 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 index a49b807..0dd7315 100644 --- 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 index 497c894..6468ace 100644 --- 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 index e5876fc..7d0ac8a 100644 --- 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 index 514fdea..6a948df 100644 --- 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 index 224bb17..2b1a9f9 100644 --- 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 index 2e7be8e..114d12a 100644 --- 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 index a76a458..d9884b8 100644 --- 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 index e86b503..c382e1f 100644 --- 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 index 13f68ce..012c13a 100644 --- 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 index 170d925..3bf00a9 100644 --- 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 index cab7d3a..375bf63 100644 --- 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 index 2dca656..b63d0f4 100644 --- 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 index 645339b..3813928 100644 --- 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 index cab7d3a..375bf63 100644 --- 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 index f88c2e6..695086b 100644 --- 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 index 1319525..23825fa 100644 --- 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 index 8c9085f..844a32f 100644 --- 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 index fecdb46..927d510 100644 --- 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 index b50411e..c322a50 100644 --- 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 index 59738e6..35bd347 100644 --- 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 index 22ee925..c1a87d1 100644 --- 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 index cab7d3a..375bf63 100644 --- 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 index f7af419..7929007 100644 --- 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 +) diff --git a/go.sum b/go.sum index 59f520b..85f8d4f 100644 --- a/go.sum +++ b/go.sum @@ -52,7 +52,10 @@ github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwj github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -77,6 +80,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible h1:dvc1KSkIYTVjZgHf/CTC2diTYC8PzhaA5sFISRfNVrE= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= @@ -91,6 +96,8 @@ github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= @@ -108,6 +115,8 @@ github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGK github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-redis/redis/v7 v7.4.0 h1:7obg6wUoj05T0EpY0o8B59S9w5yeMWql7sw2kwNW1x4= github.com/go-redis/redis/v7 v7.4.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= +github.com/go-redis/redis/v8 v8.11.4 h1:kHoYkfZP6+pe04aFTnhDH6GDROa5yJdHJVNxV3F46Tg= +github.com/go-redis/redis/v8 v8.11.4/go.mod h1:2Z2wHZXdQpCDXEGzqMockDpNyYvi2l4Pxt6RJr792+w= github.com/go-resty/resty/v2 v2.1.0 h1:Z6IefCpUMfnvItVJaJXWv/pMiiD11So35QgwEELsldE= github.com/go-resty/resty/v2 v2.1.0/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= @@ -115,6 +124,7 @@ github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -131,8 +141,16 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomodule/redigo v1.8.4 h1:Z5JUg94HMTR1XpwBaSH4vq3+PNSIykBLxMdglbw10gg= @@ -146,8 +164,11 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -191,7 +212,6 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -299,16 +319,24 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE= github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c= +github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI= @@ -390,6 +418,8 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da h1:NimzV1aGyq29m5ukMK0AMWEhFaL/lrEOaephfuoiARg= github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= @@ -425,8 +455,9 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -446,7 +477,9 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -465,8 +498,12 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20170207211851-4464e7848382/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -477,8 +514,10 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -501,15 +540,28 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa h1:mQTN3ECqfsViCNBgq+A40vdwhkGykrrQlYe3mPj6BoU= -golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -538,14 +590,17 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825 h1:aNQeSIHKi0RWpKA5NO0CqyLjx6Beh5l0LLUEnndEjz0= -golang.org/x/tools v0.0.0-20200125223703-d33eef8e6825/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8= +golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20170206182103-3d017632ea10/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -572,13 +627,21 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= diff --git a/hogwarts/courselist.go b/hogwarts/courselist.go index f96143b..8b8750d 100644 --- a/hogwarts/courselist.go +++ b/hogwarts/courselist.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package hogwarts diff --git a/hotelbusiness/hotels.go b/hotelbusiness/hotels.go index 0a13167..d11e980 100644 --- a/hotelbusiness/hotels.go +++ b/hotelbusiness/hotels.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package hotelbusiness diff --git a/illegal/field.go b/illegal/field.go index daf0040..84eb2d0 100644 --- a/illegal/field.go +++ b/illegal/field.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package illegal diff --git a/illegal/internal/struct.go b/illegal/internal/struct.go index 4bfe525..5023f2f 100644 --- a/illegal/internal/struct.go +++ b/illegal/internal/struct.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package internal diff --git a/illegal/string.go b/illegal/string.go index 92451ba..3f12b3b 100644 --- a/illegal/string.go +++ b/illegal/string.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package illegal diff --git a/jsonlist/jsonlist.go b/jsonlist/jsonlist.go index d4ffeb5..8eba2c8 100644 --- a/jsonlist/jsonlist.go +++ b/jsonlist/jsonlist.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package jsonlist diff --git a/jsonrpc/jsonrpc.go b/jsonrpc/jsonrpc.go index 2a52257..5ec415e 100644 --- a/jsonrpc/jsonrpc.go +++ b/jsonrpc/jsonrpc.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package jsonrpc diff --git a/keylock/keylock.go b/keylock/keylock.go index c8d0a43..7e21132 100644 --- a/keylock/keylock.go +++ b/keylock/keylock.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package keylock diff --git a/lectures/07-sql/conf/stats.go b/lectures/07-sql/conf/stats.go index c6d8c6c..16ff4fd 100644 --- a/lectures/07-sql/conf/stats.go +++ b/lectures/07-sql/conf/stats.go @@ -1,5 +1,7 @@ package conf +import "time" + type DBStats struct { MaxOpenConnections int // Maximum number of open connections to the database; added in Go 1.11 diff --git a/lrucache/cache.go b/lrucache/cache.go index b123a53..043dec7 100644 --- a/lrucache/cache.go +++ b/lrucache/cache.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package lrucache diff --git a/lrucache/lru.go b/lrucache/lru.go index 570c32b..357968d 100644 --- a/lrucache/lru.go +++ b/lrucache/lru.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package lrucache diff --git a/olympics/main.go b/olympics/main.go index cab7d3a..375bf63 100644 --- a/olympics/main.go +++ b/olympics/main.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package main diff --git a/once/once.go b/once/once.go index ec2f577..28d206f 100644 --- a/once/once.go +++ b/once/once.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package once diff --git a/otp/cipher.go b/otp/cipher.go index a9327dc..dafcb2f 100644 --- a/otp/cipher.go +++ b/otp/cipher.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package otp diff --git a/pubsub/my_pubsub.go b/pubsub/my_pubsub.go index 4755374..81b7d6a 100644 --- a/pubsub/my_pubsub.go +++ b/pubsub/my_pubsub.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package pubsub diff --git a/pubsub/pubsub.go b/pubsub/pubsub.go index ac3b8f3..cae3565 100644 --- a/pubsub/pubsub.go +++ b/pubsub/pubsub.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package pubsub diff --git a/ratelimit/ratelimit.go b/ratelimit/ratelimit.go index 3695c3d..8ebca19 100644 --- a/ratelimit/ratelimit.go +++ b/ratelimit/ratelimit.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package ratelimit diff --git a/retryupdate/kvapi/api.go b/retryupdate/kvapi/api.go index 93c8c1c..0ce5bae 100644 --- a/retryupdate/kvapi/api.go +++ b/retryupdate/kvapi/api.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package kvapi diff --git a/retryupdate/kvapi/errors.go b/retryupdate/kvapi/errors.go index 0c7fea8..28599d2 100644 --- a/retryupdate/kvapi/errors.go +++ b/retryupdate/kvapi/errors.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package kvapi diff --git a/retryupdate/update.go b/retryupdate/update.go index 651b6cc..42ade37 100644 --- a/retryupdate/update.go +++ b/retryupdate/update.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package retryupdate diff --git a/reversemap/reversemap.go b/reversemap/reversemap.go index 742844d..b7a99cc 100644 --- a/reversemap/reversemap.go +++ b/reversemap/reversemap.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package reversemap diff --git a/rwmutex/rwmutex.go b/rwmutex/rwmutex.go index 53f1663..2a7b561 100644 --- a/rwmutex/rwmutex.go +++ b/rwmutex/rwmutex.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package rwmutex diff --git a/speller/speller.go b/speller/speller.go index 4e0c530..0e4d114 100644 --- a/speller/speller.go +++ b/speller/speller.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package speller diff --git a/structtags/structtags.go b/structtags/structtags.go index b40187f..091f952 100644 --- a/structtags/structtags.go +++ b/structtags/structtags.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package structtags diff --git a/sum/sum.go b/sum/sum.go index cfe2f18..3ae5e2d 100644 --- a/sum/sum.go +++ b/sum/sum.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package sum diff --git a/tabletest/coverage_test.go b/tabletest/coverage_test.go index 043cda7..6fc9f69 100644 --- a/tabletest/coverage_test.go +++ b/tabletest/coverage_test.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package tabletest diff --git a/tabletest/parse_duration.go b/tabletest/parse_duration.go index b99baeb..f60fe08 100644 --- a/tabletest/parse_duration.go +++ b/tabletest/parse_duration.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package tabletest diff --git a/testequal/assertions.go b/testequal/assertions.go index 477cd90..b73260f 100644 --- a/testequal/assertions.go +++ b/testequal/assertions.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package testequal diff --git a/testequal/t.go b/testequal/t.go index ec1e38a..0d485cf 100644 --- a/testequal/t.go +++ b/testequal/t.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package testequal diff --git a/testifycheck/testifycheck.go b/testifycheck/testifycheck.go index 829c1ec..d7886bc 100644 --- a/testifycheck/testifycheck.go +++ b/testifycheck/testifycheck.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package testifycheck diff --git a/tools/testtool/buildtags.go b/tools/testtool/buildtags.go index e2380b9..a9d9de3 100644 --- a/tools/testtool/buildtags.go +++ b/tools/testtool/buildtags.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package testtool diff --git a/tools/testtool/commands/test_submission.go b/tools/testtool/commands/test_submission.go index 0c24c81..70f964d 100644 --- a/tools/testtool/commands/test_submission.go +++ b/tools/testtool/commands/test_submission.go @@ -240,7 +240,8 @@ func runTests(testDir, privateRepo, problem string) error { binaries := map[string]string{} testBinaries := map[string]string{} - binPkgs, testPkgs := listTestsAndBinaries(filepath.Join(testDir, problem), []string{"-tags", "private", "-mod", "readonly"}) + //binPkgs, testPkgs := listTestsAndBinaries(filepath.Join(testDir, problem), []string{"-tags", "private", "-mod", "readonly"}) // todo return readonly + binPkgs, testPkgs := listTestsAndBinaries(filepath.Join(testDir, problem), []string{"-tags", "private"}) for binaryPkg := range binPkgs { binPath := filepath.Join(binCache, randomName()) binaries[binaryPkg] = binPath diff --git a/tools/testtool/testdata/submissions/correct/coverme/private/.golangci.yml b/tools/testtool/testdata/submissions/correct/coverme/private/.golangci.yml index 4b4d4be..207bcb7 100644 --- a/tools/testtool/testdata/submissions/correct/coverme/private/.golangci.yml +++ b/tools/testtool/testdata/submissions/correct/coverme/private/.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/tools/testtool/testdata/submissions/correct/coverme/private/coverme/coverage_test.go b/tools/testtool/testdata/submissions/correct/coverme/private/coverme/coverage_test.go index a9c1cc8..639c8c2 100644 --- a/tools/testtool/testdata/submissions/correct/coverme/private/coverme/coverage_test.go +++ b/tools/testtool/testdata/submissions/correct/coverme/private/coverme/coverage_test.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package coverme_test diff --git a/tools/testtool/testdata/submissions/correct/coverme/private/coverme/service.go b/tools/testtool/testdata/submissions/correct/coverme/private/coverme/service.go index 48e8e89..33928a2 100644 --- a/tools/testtool/testdata/submissions/correct/coverme/private/coverme/service.go +++ b/tools/testtool/testdata/submissions/correct/coverme/private/coverme/service.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package coverme diff --git a/tools/testtool/testdata/submissions/correct/coverme/private/coverme/solution_test.go b/tools/testtool/testdata/submissions/correct/coverme/private/coverme/solution_test.go index 059a2b5..5a4c4bd 100644 --- a/tools/testtool/testdata/submissions/correct/coverme/private/coverme/solution_test.go +++ b/tools/testtool/testdata/submissions/correct/coverme/private/coverme/solution_test.go @@ -1,3 +1,4 @@ +//go:build solution // +build solution package coverme diff --git a/tools/testtool/testdata/submissions/correct/coverme/private/coverme/subpkg/f.go b/tools/testtool/testdata/submissions/correct/coverme/private/coverme/subpkg/f.go index cb0417a..8abf6b7 100644 --- a/tools/testtool/testdata/submissions/correct/coverme/private/coverme/subpkg/f.go +++ b/tools/testtool/testdata/submissions/correct/coverme/private/coverme/subpkg/f.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package subpkg diff --git a/tools/testtool/testdata/submissions/correct/coverme/student/coverme/coverage_test.go b/tools/testtool/testdata/submissions/correct/coverme/student/coverme/coverage_test.go index a9c1cc8..639c8c2 100644 --- a/tools/testtool/testdata/submissions/correct/coverme/student/coverme/coverage_test.go +++ b/tools/testtool/testdata/submissions/correct/coverme/student/coverme/coverage_test.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package coverme_test diff --git a/tools/testtool/testdata/submissions/correct/coverme/student/coverme/service.go b/tools/testtool/testdata/submissions/correct/coverme/student/coverme/service.go index 48e8e89..33928a2 100644 --- a/tools/testtool/testdata/submissions/correct/coverme/student/coverme/service.go +++ b/tools/testtool/testdata/submissions/correct/coverme/student/coverme/service.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package coverme diff --git a/tools/testtool/testdata/submissions/correct/coverme/student/coverme/subpkg/f.go b/tools/testtool/testdata/submissions/correct/coverme/student/coverme/subpkg/f.go index cb0417a..8abf6b7 100644 --- a/tools/testtool/testdata/submissions/correct/coverme/student/coverme/subpkg/f.go +++ b/tools/testtool/testdata/submissions/correct/coverme/student/coverme/subpkg/f.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package subpkg diff --git a/tools/testtool/testdata/submissions/correct/cumulativecoverage/private/.golangci.yml b/tools/testtool/testdata/submissions/correct/cumulativecoverage/private/.golangci.yml index 4b4d4be..207bcb7 100644 --- a/tools/testtool/testdata/submissions/correct/cumulativecoverage/private/.golangci.yml +++ b/tools/testtool/testdata/submissions/correct/cumulativecoverage/private/.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/tools/testtool/testdata/submissions/correct/cumulativecoverage/private/cumulativecoverage/big/solution_test.go b/tools/testtool/testdata/submissions/correct/cumulativecoverage/private/cumulativecoverage/big/solution_test.go index 72642e6..d260b1b 100644 --- a/tools/testtool/testdata/submissions/correct/cumulativecoverage/private/cumulativecoverage/big/solution_test.go +++ b/tools/testtool/testdata/submissions/correct/cumulativecoverage/private/cumulativecoverage/big/solution_test.go @@ -1,3 +1,4 @@ +//go:build solution // +build solution package big diff --git a/tools/testtool/testdata/submissions/correct/cumulativecoverage/private/cumulativecoverage/small/solution_test.go b/tools/testtool/testdata/submissions/correct/cumulativecoverage/private/cumulativecoverage/small/solution_test.go index e5b1bab..226e67a 100644 --- a/tools/testtool/testdata/submissions/correct/cumulativecoverage/private/cumulativecoverage/small/solution_test.go +++ b/tools/testtool/testdata/submissions/correct/cumulativecoverage/private/cumulativecoverage/small/solution_test.go @@ -1,3 +1,4 @@ +//go:build solution // +build solution package small diff --git a/tools/testtool/testdata/submissions/correct/sum/private/.golangci.yml b/tools/testtool/testdata/submissions/correct/sum/private/.golangci.yml index 4b4d4be..207bcb7 100644 --- a/tools/testtool/testdata/submissions/correct/sum/private/.golangci.yml +++ b/tools/testtool/testdata/submissions/correct/sum/private/.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/tools/testtool/testdata/submissions/correct/sum/private/sum/sum.go b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum.go index cfe2f18..3ae5e2d 100644 --- a/tools/testtool/testdata/submissions/correct/sum/private/sum/sum.go +++ b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package sum diff --git a/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_private_test.go b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_private_test.go index 394d3ca..5251d91 100644 --- a/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_private_test.go +++ b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_private_test.go @@ -1,3 +1,4 @@ +//go:build private // +build private package sum diff --git a/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_solution.go b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_solution.go index 45b63b7..f35949d 100644 --- a/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_solution.go +++ b/tools/testtool/testdata/submissions/correct/sum/private/sum/sum_solution.go @@ -1,3 +1,4 @@ +//go:build solution // +build solution package sum diff --git a/tools/testtool/testdata/submissions/correct/sum/private/sum/summer.go b/tools/testtool/testdata/submissions/correct/sum/private/sum/summer.go index 77889c1..6ab3b21 100644 --- a/tools/testtool/testdata/submissions/correct/sum/private/sum/summer.go +++ b/tools/testtool/testdata/submissions/correct/sum/private/sum/summer.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package sum diff --git a/tools/testtool/testdata/submissions/correct/sum/student/sum/sum.go b/tools/testtool/testdata/submissions/correct/sum/student/sum/sum.go index 412da5d..66f83d4 100644 --- a/tools/testtool/testdata/submissions/correct/sum/student/sum/sum.go +++ b/tools/testtool/testdata/submissions/correct/sum/student/sum/sum.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package sum diff --git a/tools/testtool/testdata/submissions/incorrect/badbenchmark/private/.golangci.yml b/tools/testtool/testdata/submissions/incorrect/badbenchmark/private/.golangci.yml index 4b4d4be..207bcb7 100644 --- a/tools/testtool/testdata/submissions/incorrect/badbenchmark/private/.golangci.yml +++ b/tools/testtool/testdata/submissions/incorrect/badbenchmark/private/.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/tools/testtool/testdata/submissions/incorrect/badbenchmark/private/badbenchmark/sum.go b/tools/testtool/testdata/submissions/incorrect/badbenchmark/private/badbenchmark/sum.go index f14ecf9..2165e7e 100644 --- a/tools/testtool/testdata/submissions/incorrect/badbenchmark/private/badbenchmark/sum.go +++ b/tools/testtool/testdata/submissions/incorrect/badbenchmark/private/badbenchmark/sum.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package badbenchmark diff --git a/tools/testtool/testdata/submissions/incorrect/badbenchmark/private/badbenchmark/sum_solution.go b/tools/testtool/testdata/submissions/incorrect/badbenchmark/private/badbenchmark/sum_solution.go index 17f973c..51ae639 100644 --- a/tools/testtool/testdata/submissions/incorrect/badbenchmark/private/badbenchmark/sum_solution.go +++ b/tools/testtool/testdata/submissions/incorrect/badbenchmark/private/badbenchmark/sum_solution.go @@ -1,3 +1,4 @@ +//go:build solution // +build solution package badbenchmark diff --git a/tools/testtool/testdata/submissions/incorrect/badbenchmark/student/badbenchmark/sum.go b/tools/testtool/testdata/submissions/incorrect/badbenchmark/student/badbenchmark/sum.go index 2b82c35..b5b255f 100644 --- a/tools/testtool/testdata/submissions/incorrect/badbenchmark/student/badbenchmark/sum.go +++ b/tools/testtool/testdata/submissions/incorrect/badbenchmark/student/badbenchmark/sum.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package badbenchmark diff --git a/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/.golangci.yml b/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/.golangci.yml index 4b4d4be..207bcb7 100644 --- a/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/.golangci.yml +++ b/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/.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/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/brokenstyle/sum.go b/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/brokenstyle/sum.go index bb7b546..c0cc568 100644 --- a/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/brokenstyle/sum.go +++ b/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/brokenstyle/sum.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package brokenstyle diff --git a/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/brokenstyle/sum_private_test.go b/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/brokenstyle/sum_private_test.go index 0fd61be..1c324b5 100644 --- a/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/brokenstyle/sum_private_test.go +++ b/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/brokenstyle/sum_private_test.go @@ -1,3 +1,4 @@ +//go:build private // +build private package brokenstyle diff --git a/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/brokenstyle/sum_solution.go b/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/brokenstyle/sum_solution.go index 4c8b56e..3bea6b0 100644 --- a/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/brokenstyle/sum_solution.go +++ b/tools/testtool/testdata/submissions/incorrect/brokenstyle/private/brokenstyle/sum_solution.go @@ -1,3 +1,4 @@ +//go:build solution // +build solution package brokenstyle diff --git a/tools/testtool/testdata/submissions/incorrect/brokenstyle/student/brokenstyle/sum.go b/tools/testtool/testdata/submissions/incorrect/brokenstyle/student/brokenstyle/sum.go index 14a8246..989c7c4 100644 --- a/tools/testtool/testdata/submissions/incorrect/brokenstyle/student/brokenstyle/sum.go +++ b/tools/testtool/testdata/submissions/incorrect/brokenstyle/student/brokenstyle/sum.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package brokenstyle diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/private/.golangci.yml b/tools/testtool/testdata/submissions/incorrect/brokentest/private/.golangci.yml index 4b4d4be..207bcb7 100644 --- a/tools/testtool/testdata/submissions/incorrect/brokentest/private/.golangci.yml +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/private/.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/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum.go b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum.go index cab97a1..bde8990 100644 --- a/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum.go +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package brokentest diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_private_test.go b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_private_test.go index d3d265d..e42a970 100644 --- a/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_private_test.go +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_private_test.go @@ -1,3 +1,4 @@ +//go:build private // +build private package brokentest diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_solution.go b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_solution.go index b0f79d4..209638a 100644 --- a/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_solution.go +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/private/brokentest/sum_solution.go @@ -1,3 +1,4 @@ +//go:build solution // +build solution package brokentest diff --git a/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/sum.go b/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/sum.go index 4c57f02..afbd28e 100644 --- a/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/sum.go +++ b/tools/testtool/testdata/submissions/incorrect/brokentest/student/brokentest/sum.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package brokentest diff --git a/tools/testtool/testdata/submissions/incorrect/extracoverage/private/.golangci.yml b/tools/testtool/testdata/submissions/incorrect/extracoverage/private/.golangci.yml index 4b4d4be..207bcb7 100644 --- a/tools/testtool/testdata/submissions/incorrect/extracoverage/private/.golangci.yml +++ b/tools/testtool/testdata/submissions/incorrect/extracoverage/private/.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/tools/testtool/testdata/submissions/incorrect/extracoverage/private/extracoverage/coverage_test.go b/tools/testtool/testdata/submissions/incorrect/extracoverage/private/extracoverage/coverage_test.go index 6711fd8..9eddb27 100644 --- a/tools/testtool/testdata/submissions/incorrect/extracoverage/private/extracoverage/coverage_test.go +++ b/tools/testtool/testdata/submissions/incorrect/extracoverage/private/extracoverage/coverage_test.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package extracoverage diff --git a/tools/testtool/testdata/submissions/incorrect/extracoverage/private/extracoverage/service.go b/tools/testtool/testdata/submissions/incorrect/extracoverage/private/extracoverage/service.go index 56ce5e8..3543f68 100644 --- a/tools/testtool/testdata/submissions/incorrect/extracoverage/private/extracoverage/service.go +++ b/tools/testtool/testdata/submissions/incorrect/extracoverage/private/extracoverage/service.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package extracoverage diff --git a/tools/testtool/testdata/submissions/incorrect/extracoverage/private/extracoverage/solution_test.go b/tools/testtool/testdata/submissions/incorrect/extracoverage/private/extracoverage/solution_test.go index 0ab1524..a4617d7 100644 --- a/tools/testtool/testdata/submissions/incorrect/extracoverage/private/extracoverage/solution_test.go +++ b/tools/testtool/testdata/submissions/incorrect/extracoverage/private/extracoverage/solution_test.go @@ -1,3 +1,4 @@ +//go:build solution // +build solution package extracoverage diff --git a/tools/testtool/testdata/submissions/incorrect/extracoverage/student/.golangci.yml b/tools/testtool/testdata/submissions/incorrect/extracoverage/student/.golangci.yml index 4b4d4be..207bcb7 100644 --- a/tools/testtool/testdata/submissions/incorrect/extracoverage/student/.golangci.yml +++ b/tools/testtool/testdata/submissions/incorrect/extracoverage/student/.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/tools/testtool/testdata/submissions/incorrect/extracoverage/student/extracoverage/coverage_test.go b/tools/testtool/testdata/submissions/incorrect/extracoverage/student/extracoverage/coverage_test.go index 6711fd8..9eddb27 100644 --- a/tools/testtool/testdata/submissions/incorrect/extracoverage/student/extracoverage/coverage_test.go +++ b/tools/testtool/testdata/submissions/incorrect/extracoverage/student/extracoverage/coverage_test.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package extracoverage diff --git a/tools/testtool/testdata/submissions/incorrect/extracoverage/student/extracoverage/service.go b/tools/testtool/testdata/submissions/incorrect/extracoverage/student/extracoverage/service.go index 56ce5e8..3543f68 100644 --- a/tools/testtool/testdata/submissions/incorrect/extracoverage/student/extracoverage/service.go +++ b/tools/testtool/testdata/submissions/incorrect/extracoverage/student/extracoverage/service.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package extracoverage diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/private/.golangci.yml b/tools/testtool/testdata/submissions/incorrect/newdependency/private/.golangci.yml index 4b4d4be..207bcb7 100644 --- a/tools/testtool/testdata/submissions/incorrect/newdependency/private/.golangci.yml +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/private/.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/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum.go b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum.go index f8ce74b..f05e8d0 100644 --- a/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum.go +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package newdependency diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_private_test.go b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_private_test.go index ec91678..49d04a6 100644 --- a/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_private_test.go +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_private_test.go @@ -1,3 +1,4 @@ +//go:build private // +build private package newdependency diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_solution.go b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_solution.go index eaa3f75..f957dcb 100644 --- a/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_solution.go +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/private/newdependency/sum_solution.go @@ -1,3 +1,4 @@ +//go:build solution // +build solution package newdependency diff --git a/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/sum.go b/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/sum.go index 84d88b3..16c33e3 100644 --- a/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/sum.go +++ b/tools/testtool/testdata/submissions/incorrect/newdependency/student/newdependency/sum.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package newdependency diff --git a/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/.golangci.yml b/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/.golangci.yml index 4b4d4be..207bcb7 100644 --- a/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/.golangci.yml +++ b/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/.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/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/poorcoverage/coverage_test.go b/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/poorcoverage/coverage_test.go index 41647e0..946f3a5 100644 --- a/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/poorcoverage/coverage_test.go +++ b/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/poorcoverage/coverage_test.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package poorcoverage_test diff --git a/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/poorcoverage/service.go b/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/poorcoverage/service.go index d7e2cad..6f961b8 100644 --- a/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/poorcoverage/service.go +++ b/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/poorcoverage/service.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package poorcoverage diff --git a/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/poorcoverage/solution_test.go b/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/poorcoverage/solution_test.go index 00ab41c..48e180a 100644 --- a/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/poorcoverage/solution_test.go +++ b/tools/testtool/testdata/submissions/incorrect/poorcoverage/private/poorcoverage/solution_test.go @@ -1,3 +1,4 @@ +//go:build solution // +build solution package poorcoverage diff --git a/tools/testtool/testdata/submissions/incorrect/poorcoverage/student/poorcoverage/coverage_test.go b/tools/testtool/testdata/submissions/incorrect/poorcoverage/student/poorcoverage/coverage_test.go index 41647e0..946f3a5 100644 --- a/tools/testtool/testdata/submissions/incorrect/poorcoverage/student/poorcoverage/coverage_test.go +++ b/tools/testtool/testdata/submissions/incorrect/poorcoverage/student/poorcoverage/coverage_test.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package poorcoverage_test diff --git a/tools/testtool/testdata/submissions/incorrect/poorcoverage/student/poorcoverage/service.go b/tools/testtool/testdata/submissions/incorrect/poorcoverage/student/poorcoverage/service.go index d7e2cad..6f961b8 100644 --- a/tools/testtool/testdata/submissions/incorrect/poorcoverage/student/poorcoverage/service.go +++ b/tools/testtool/testdata/submissions/incorrect/poorcoverage/student/poorcoverage/service.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package poorcoverage diff --git a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/.golangci.yml b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/.golangci.yml index 4b4d4be..207bcb7 100644 --- a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/.golangci.yml +++ b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/.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/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/coverage_test.go b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/coverage_test.go index 064585e..b726181 100644 --- a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/coverage_test.go +++ b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/coverage_test.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package skippedcoverpkg diff --git a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/product/product.go b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/product/product.go index 3436750..4931739 100644 --- a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/product/product.go +++ b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/product/product.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package product diff --git a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/product/solution_test.go b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/product/solution_test.go index d3f0d47..bcfa7a3 100644 --- a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/product/solution_test.go +++ b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/product/solution_test.go @@ -1,3 +1,4 @@ +//go:build solution // +build solution package product diff --git a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/sum/solution_test.go b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/sum/solution_test.go index 6b10145..966de78 100644 --- a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/sum/solution_test.go +++ b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/sum/solution_test.go @@ -1,3 +1,4 @@ +//go:build solution // +build solution package sum diff --git a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/sum/sum.go b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/sum/sum.go index 73bd39f..482298c 100644 --- a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/sum/sum.go +++ b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/private/skippedcoverpkg/sum/sum.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package sum diff --git a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/.golangci.yml b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/.golangci.yml index 4b4d4be..207bcb7 100644 --- a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/.golangci.yml +++ b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/.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/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/skippedcoverpkg/coverage_test.go b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/skippedcoverpkg/coverage_test.go index fed1a2a..4c9b328 100644 --- a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/skippedcoverpkg/coverage_test.go +++ b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/skippedcoverpkg/coverage_test.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package skippedcoverpkg diff --git a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/skippedcoverpkg/product/product.go b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/skippedcoverpkg/product/product.go index 3436750..4931739 100644 --- a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/skippedcoverpkg/product/product.go +++ b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/skippedcoverpkg/product/product.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package product diff --git a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/skippedcoverpkg/sum/sum.go b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/skippedcoverpkg/sum/sum.go index 73bd39f..482298c 100644 --- a/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/skippedcoverpkg/sum/sum.go +++ b/tools/testtool/testdata/submissions/incorrect/skippedcoverpkg/student/skippedcoverpkg/sum/sum.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package sum diff --git a/tparallel/tparallel.go b/tparallel/tparallel.go index 50550a1..a1bd395 100644 --- a/tparallel/tparallel.go +++ b/tparallel/tparallel.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package tparallel diff --git a/urlfetch/main.go b/urlfetch/main.go index cab7d3a..375bf63 100644 --- a/urlfetch/main.go +++ b/urlfetch/main.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package main diff --git a/urlfetch/main_test.go b/urlfetch/main_test.go index c7f3ff5..e535134 100644 --- a/urlfetch/main_test.go +++ b/urlfetch/main_test.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package main diff --git a/urlshortener/main.go b/urlshortener/main.go index cab7d3a..375bf63 100644 --- a/urlshortener/main.go +++ b/urlshortener/main.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package main diff --git a/utf8/reverse/reverse.go b/utf8/reverse/reverse.go index 09abf4b..885ff35 100644 --- a/utf8/reverse/reverse.go +++ b/utf8/reverse/reverse.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package reverse diff --git a/utf8/spacecollapse/collapse.go b/utf8/spacecollapse/collapse.go index 301920c..34b21b8 100644 --- a/utf8/spacecollapse/collapse.go +++ b/utf8/spacecollapse/collapse.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package spacecollapse diff --git a/varfmt/fmt.go b/varfmt/fmt.go index 073224f..50396c1 100644 --- a/varfmt/fmt.go +++ b/varfmt/fmt.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package varfmt diff --git a/varjoin/join.go b/varjoin/join.go index c32bc55..39e658f 100644 --- a/varjoin/join.go +++ b/varjoin/join.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package varjoin diff --git a/waitgroup/waitgroup.go b/waitgroup/waitgroup.go index a44decd..6925be0 100644 --- a/waitgroup/waitgroup.go +++ b/waitgroup/waitgroup.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package waitgroup diff --git a/wordcount/main.go b/wordcount/main.go index cab7d3a..375bf63 100644 --- a/wordcount/main.go +++ b/wordcount/main.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package main diff --git a/wordcount/main_test.go b/wordcount/main_test.go index 179c227..f29734c 100644 --- a/wordcount/main_test.go +++ b/wordcount/main_test.go @@ -1,3 +1,4 @@ +//go:build !change // +build !change package main diff --git a/wscat/main.go b/wscat/main.go index cab7d3a..375bf63 100644 --- a/wscat/main.go +++ b/wscat/main.go @@ -1,3 +1,4 @@ +//go:build !solution // +build !solution package main