go.mod: update dependencies (#272)

Makefile

@@ -68,19 +68,31 @@ static: tools
 	tools/bin/goimports -w -d -format-only -local $(BR_PKG) $$($(PACKAGE_DIRECTORIES)) 2>&1 | $(GOCHECKER)
 	tools/bin/govet --shadow $$($(PACKAGE_DIRECTORIES)) 2>&1 | $(GOCHECKER)
 
+	@# why some lints are disabled?
+	@#   gochecknoglobals - disabled because we do use quite a lot of globals
+	@#          goimports - executed above already
+	@#              gofmt - ditto
+	@#                wsl - too pedantic about the formatting
+	@#             funlen - PENDING REFACTORING
+	@#           gocognit - PENDING REFACTORING
+	@#              godox - TODO
+	@#              gomnd - too many magic numbers, and too pedantic (even 2*x got flagged...)
+	@#        testpackage - several test packages still rely on private functions
+	@#             nestif - PENDING REFACTORING
+	@#           goerr113 - it mistaken pingcap/errors with standard errors
 	CGO_ENABLED=0 tools/bin/golangci-lint run --enable-all --deadline 120s \
 		--disable gochecknoglobals \
-		--disable gochecknoinits \
-		--disable interfacer \
 		--disable goimports \
 		--disable gofmt \
 		--disable wsl \
 		--disable funlen \
-		--disable whitespace \
 		--disable gocognit \
 		--disable godox \
 		--disable gomnd \
-		$$($(PACKAGE_DIRECTORIES)) || true
+		--disable testpackage \
+		--disable nestif \
+		--disable goerr113 \
+		$$($(PACKAGE_DIRECTORIES))
 
 lint: tools
 	@echo "linting"

cmd/cmd.go

@@ -140,7 +140,7 @@ func Init(cmd *cobra.Command) (err error) {
 	return err
 }
 
-// HasLogFile returns whether we set a log file
+// HasLogFile returns whether we set a log file.
 func HasLogFile() bool {
 	return atomic.LoadUint64(&hasLogFile) != uint64(0)
 }

cmd/restore.go

@@ -42,7 +42,7 @@ func runRestoreTiflashReplicaCommand(command *cobra.Command, cmdName string) err
 	return task.RunRestoreTiflashReplica(GetDefaultContext(), tidbGlue, cmdName, &cfg)
 }
 
-// NewRestoreCommand returns a restore subcommand
+// NewRestoreCommand returns a restore subcommand.
 func NewRestoreCommand() *cobra.Command {
 	command := &cobra.Command{
 		Use:          "restore",

go.mod

@@ -3,40 +3,31 @@ module github.com/pingcap/br
 go 1.13
 
 require (
-	cloud.google.com/go/storage v1.4.0
-	github.com/aws/aws-sdk-go v1.26.1
-	github.com/cheggaaa/pb/v3 v3.0.1
-	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
-	github.com/fsouza/fake-gcs-server v1.15.0
-	github.com/go-sql-driver/mysql v1.4.1
+	cloud.google.com/go/storage v1.5.0
+	github.com/aws/aws-sdk-go v1.30.24
+	github.com/cheggaaa/pb/v3 v3.0.4
+	github.com/fsouza/fake-gcs-server v1.17.0
+	github.com/go-sql-driver/mysql v1.5.0
 	github.com/gogo/protobuf v1.3.1
 	github.com/google/btree v1.0.0
 	github.com/google/uuid v1.1.1
-	github.com/klauspost/cpuid v1.2.0 // indirect
-	github.com/montanaflynn/stats v0.5.0 // indirect
-	github.com/onsi/ginkgo v1.11.0 // indirect
-	github.com/onsi/gomega v1.8.1 // indirect
 	github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712
 	github.com/pingcap/errors v0.11.5-0.20190809092503-95897b64e011
-	github.com/pingcap/kvproto v0.0.0-20200424032552-6650270c39c3
+	github.com/pingcap/kvproto v0.0.0-20200509065137-6a4d5c264a8b
 	github.com/pingcap/log v0.0.0-20200117041106-d28c14d3b1cd
-	github.com/pingcap/parser v0.0.0-20200425031156-fb338edcaac2
-	github.com/pingcap/pd/v4 v4.0.0-rc.1.0.20200422143320-428acd53eba2
-	github.com/pingcap/tidb v1.1.0-beta.0.20200424160056-7267747ae0ec
+	github.com/pingcap/parser v0.0.0-20200427031542-879c7bd4f27d
+	github.com/pingcap/pd/v4 v4.0.0-rc.1.0.20200511074607-3bb650739add
+	github.com/pingcap/tidb v1.1.0-beta.0.20200511122205-5cc5d0e2acad
 	github.com/pingcap/tidb-tools v4.0.0-rc.1.0.20200421113014-507d2bb3a15e+incompatible
 	github.com/pingcap/tipb v0.0.0-20200417094153-7316d94df1ee
-	github.com/prometheus/client_golang v1.0.0
-	github.com/prometheus/common v0.4.1
-	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/cobra v0.0.5
+	github.com/prometheus/client_golang v1.5.1
+	github.com/prometheus/common v0.9.1
+	github.com/sirupsen/logrus v1.6.0
+	github.com/spf13/cobra v1.0.0
 	github.com/spf13/pflag v1.0.5
-	github.com/syndtr/goleveldb v1.0.1-0.20190625010220-02440ea7a285 // indirect
-	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
 	go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
-	go.opencensus.io v0.22.2 // indirect
-	go.uber.org/zap v1.14.1
-	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
-	google.golang.org/api v0.14.0
-	google.golang.org/grpc v1.25.1
+	go.uber.org/zap v1.15.0
+	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
+	google.golang.org/api v0.15.1
+	google.golang.org/grpc v1.26.0
 )