Update go-tools to 2020.2.1

...and a bunch of other things as I worked through the rot. Notably:
  - Upgrade to bazel 4.0.0
  - Upgrade to Go 1.15.7

Remove go_branch stderr suppression; this made it quite difficult to see
what was failing while developing this patch.

PiperOrigin-RevId: 355257833

Author: tamird

WORKSPACE

@@ -5,51 +5,42 @@ go 1.15
 replace github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.6.0
 
 require (
-	cloud.google.com/go v0.52.1-0.20200122224058-0482b626c726 // indirect
-	github.com/Microsoft/go-winio v0.4.15-0.20200908182639-5b44b70ab3ab // indirect
-	github.com/Microsoft/hcsshim v0.8.6 // indirect
+	cloud.google.com/go v0.75.0 // indirect
+	github.com/Microsoft/go-winio v0.4.16 // indirect
+	github.com/Microsoft/hcsshim v0.8.14 // indirect
 	github.com/cenkalti/backoff v1.1.1-0.20190506075156-2146c9339422 // indirect
-	github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3 // indirect
-	github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327
+	github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327 // indirect
+	github.com/containerd/console v1.0.1 // indirect
 	github.com/containerd/containerd v1.3.9 // indirect
-	github.com/containerd/continuity v0.0.0-20200928162600-f2cc35102c2a // indirect
+	github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 // indirect
 	github.com/containerd/fifo v0.0.0-20191213151349-ff969a566b00 // indirect
 	github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328 // indirect
+	github.com/containerd/ttrpc v1.0.2 // indirect
 	github.com/containerd/typeurl v0.0.0-20200205145503-b45ef1f1f737 // indirect
-	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
-	github.com/coreos/go-systemd/v22 v22.0.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
 	github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible // indirect
 	github.com/docker/docker v1.4.2-0.20191028175130-9e7d5ac5ea55 // indirect
 	github.com/docker/go-connections v0.3.0 // indirect
 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
-	github.com/docker/go-units v0.4.0 // indirect
-	github.com/dpjacques/clockwork v0.1.1-0.20200827220843-c1f524b839be // indirect
-	github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e // indirect
 	github.com/gofrs/flock v0.6.1-0.20180915234121-886344bea079 // indirect
 	github.com/gogo/googleapis v1.4.0 // indirect
-	github.com/google/go-cmp v0.5.3-0.20201020212313-ab46b8bd0abd // indirect
-	github.com/google/go-github/v28 v28.1.2-0.20191108005307-e555eab49ce8 // indirect
+	github.com/google/go-github/v32 v32.1.0 // indirect
+	github.com/google/pprof v0.0.0-20210115211752-39141e76b647 // indirect
 	github.com/google/subcommands v1.0.2-0.20190508160503-636abe8753b8 // indirect
-	github.com/hashicorp/go-multierror v1.0.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.0 // indirect
 	github.com/kr/pty v1.1.4-0.20190131011033-7dc38fb350b1 // indirect
-	github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a
+	github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a // indirect
 	github.com/mohae/deepcopy v0.0.0-20170308212314-bb9b5e7adda9 // indirect
 	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/opencontainers/runc v0.1.1 // indirect
-	github.com/opencontainers/runtime-spec v1.0.2-0.20181111125026-1722abf79c2f // indirect
 	github.com/pborman/uuid v1.2.0 // indirect
 	github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
-	github.com/urfave/cli v1.22.2 // indirect
 	github.com/vishvananda/netlink v1.0.1-0.20190930145447-2ec5bdc52b86 // indirect
-	github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
+	github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
+	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
-	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
-	golang.org/x/tools v0.0.0-20201021000207-d49c4edd7d96 // indirect
-	google.golang.org/grpc v1.29.0 // indirect
+	google.golang.org/grpc v1.36.0-dev.0.20210122012134-2c42474aca0c // indirect
 	google.golang.org/protobuf v1.25.1-0.20201020201750-d3470999428b // indirect
-	gotest.tools v2.2.0+incompatible // indirect
-	k8s.io/api v0.16.13
-	k8s.io/apimachinery v0.16.14-rc.0
-	k8s.io/client-go v0.16.13
+	honnef.co/go/tools v0.1.1 // indirect
+	k8s.io/apimachinery v0.16.14-rc.0 // indirect
+	k8s.io/client-go v0.16.13 // indirect
 )

go.mod

@@ -24,6 +24,6 @@ RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud
     ln -s /google-cloud-sdk/bin/gcloud /usr/bin/gcloud
 
 # Download the official bazel binary. The APT repository isn't used because there is not packages for arm64.
-RUN sh -c 'curl -o /usr/local/bin/bazel https://releases.bazel.build/3.5.1/release/bazel-3.5.1-linux-$(uname -m | sed s/aarch64/arm64/) && chmod ugo+x /usr/local/bin/bazel'
+RUN sh -c 'curl -o /usr/local/bin/bazel https://releases.bazel.build/4.0.0/release/bazel-4.0.0-linux-$(uname -m | sed s/aarch64/arm64/) && chmod ugo+x /usr/local/bin/bazel'
 WORKDIR /workspace
 ENTRYPOINT ["/usr/local/bin/bazel"]

go.sum

@@ -155,5 +155,6 @@ analyzers:
   SA5011:
     internal:
       exclude:
-        - pkg/sentry/fs/fdpipe/pipe_opener_test.go # False positive.
-        - pkg/tcpip/tests/integration/link_resolution_test.go # False positive.
+        # https://github.com/dominikh/go-tools/issues/924
+        - pkg/sentry/fs/fdpipe/pipe_opener_test.go
+        - pkg/tcpip/tests/integration/link_resolution_test.go

images/default/Dockerfile

@@ -75,6 +75,7 @@ UID := $(shell id -u ${USER})
 GID := $(shell id -g ${USER})
 USERADD_OPTIONS :=
 DOCKER_RUN_OPTIONS :=
+DOCKER_RUN_OPTIONS += --rm
 DOCKER_RUN_OPTIONS += --user $(UID):$(GID)
 DOCKER_RUN_OPTIONS += --entrypoint ""
 DOCKER_RUN_OPTIONS += --init
@@ -160,15 +161,13 @@ bazel-image: load-default ## Ensures that the local builder exists.
 	@docker commit $(BUILDER_NAME) gvisor.dev/images/builder >&2
 .PHONY: bazel-image
 
-# Note: when starting the bazel server, we tie the life of the container to the
-# bazel server's life, so that the container disappears naturally.
 ifneq (true,$(shell $(wrapper echo true)))
 bazel-server: bazel-image ## Ensures that the server exists.
 	@$(call header,DOCKER RUN)
 	@docker rm -f $(DOCKER_NAME) 2>/dev/null || true
-	@mkdir -p $(GCLOUD_CONFIG)
 	@mkdir -p $(BAZEL_CACHE)
-	@docker run -d --rm --name $(DOCKER_NAME) \
+	@mkdir -p $(GCLOUD_CONFIG)
+	@docker run -d --name $(DOCKER_NAME) \
 	  -v "$(CURDIR):$(CURDIR)" \
 	  --workdir "$(CURDIR)" \
 	  $(DOCKER_RUN_OPTIONS) \

nogo.yaml

@@ -9,7 +9,7 @@ go_binary(
     deps = [
         "//tools/github/nogo",
         "//tools/github/reviver",
-        "@com_github_google_go_github_v28//github:go_default_library",
+        "@com_github_google_go_github_v32//github:go_default_library",
         "@org_golang_x_oauth2//:go_default_library",
     ],
 )

tools/bazel.mk

@@ -11,6 +11,6 @@ go_library(
     ],
     deps = [
         "//tools/nogo",
-        "@com_github_google_go_github_v28//github:go_default_library",
+        "@com_github_google_go_github_v32//github:go_default_library",
     ],
 )

tools/github/BUILD

@@ -12,7 +12,7 @@ go_library(
     visibility = [
         "//tools/github:__subpackages__",
     ],
-    deps = ["@com_github_google_go_github_v28//github:go_default_library"],
+    deps = ["@com_github_google_go_github_v32//github:go_default_library"],
 )
 
 go_test(

tools/github/nogo/BUILD

@@ -48,7 +48,7 @@ readonly module origpwd othersrc
 # Build an amd64 & arm64 gopath.
 declare -r go_amd64="${tmp_dir}/amd64"
 declare -r go_arm64="${tmp_dir}/arm64"
-make build BAZEL_OPTIONS="" TARGETS="//:gopath" 2>/dev/null
+make build BAZEL_OPTIONS="" TARGETS="//:gopath"
 rsync --recursive --delete --copy-links bazel-bin/gopath/ "${go_amd64}"
 make build BAZEL_OPTIONS=--config=cross-aarch64 TARGETS="//:gopath" 2>/dev/null
 rsync --recursive --delete --copy-links bazel-bin/gopath/ "${go_arm64}"

tools/github/reviver/BUILD

@@ -2,13 +2,13 @@ diff --git a/go/private/rules/test.bzl b/go/private/rules/test.bzl
 index 17516ad7..76b6c68c 100644
 --- a/go/private/rules/test.bzl
 +++ b/go/private/rules/test.bzl
-@@ -121,9 +121,6 @@ def _go_test_impl(ctx):
+@@ -117,9 +117,6 @@ def _go_test_impl(ctx):
      )
- 
+
      test_gc_linkopts = gc_linkopts(ctx)
 -    if not go.mode.debug:
 -        # Disable symbol table and DWARF generation for test binaries.
 -        test_gc_linkopts.extend(["-s", "-w"])
- 
-     # Now compile the test binary itself
-     test_library = GoLibrary(
+
+     # Link in the run_dir global for bzltestutil
+     test_gc_linkopts.extend(["-X", "github.com/bazelbuild/rules_go/go/tools/bzltestutil.RunDir=" + run_dir])