Update boulder-tools dependencies (#6129)

Update:
- golangci-lint from v1.42.1 to v1.46.2
- protoc from v3.15.6 to v3.20.1
- protoc-gen-go from v1.26.0 to v1.28.0
- protoc-gen-go-grpc from v1.1.0 to v1.2.0
- fpm from v1.14.0 to v1.14.2

Also remove a reference to go1.17.9 from one last place.

This does result in updating all of our generated .pb.go files, but only
to update the version number embedded in each file's header.

Fixes #6123

.github/workflows/boulder-ci.yml

@@ -36,7 +36,7 @@ jobs:
       matrix:
         # Add additional docker image tags here and all tests will be run with the additional image.
         BOULDER_TOOLS_TAG:
-          - go1.18.1_2022-04-12
+          - go1.18.1_2022-05-19
         # Tests command definitions. Use the entire docker-compose command you want to run.
         tests:
           # Run ./test.sh --help for a description of each of the flags.

.github/workflows/golangci-lint.yml

@@ -21,6 +21,6 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.45.2
+          version: v1.46.2
           args: --timeout 9m
           only-new-issues: true

.github/workflows/release.yml

@@ -16,7 +16,6 @@ jobs:
       fail-fast: false
       matrix:
         GO_VERSION:
-          - 1.17.9
           - 1.18.1
     runs-on: ubuntu-20.04
     permissions:

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     # used for release builds. make-deb.sh relies on being able to parse the
     # numeric version between 'go' and the underscore-prefixed date. If you make
     # changes to these tokens, please update this parsing logic.
-    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.18.1_2022-04-12}
+    image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.18.1_2022-05-19}
     environment:
       FAKE_DNS: 10.77.77.77
       BOULDER_CONFIG_DIR: test/config

test.sh

@@ -262,7 +262,7 @@ STAGE="gomod-vendor"
 if [[ "${RUN[@]}" =~ "$STAGE" ]] ; then
   print_heading "Running Go Mod Vendor"
   go mod vendor
-  git diff --exit-code
+  run_and_expect_silence git diff --exit-code .
 fi
 
 # Run generate to make sure all our generated code can be re-generated with

test/boulder-tools/build.sh

@@ -30,21 +30,21 @@ then
   PROTO_ARCH=aarch_64
 fi
 
-curl -L https://github.com/google/protobuf/releases/download/v3.15.6/protoc-3.15.6-linux-"${PROTO_ARCH}".zip -o /tmp/protoc.zip
+curl -L https://github.com/google/protobuf/releases/download/v3.20.1/protoc-3.20.1-linux-"${PROTO_ARCH}".zip -o /tmp/protoc.zip
 unzip /tmp/protoc.zip -d /usr/local/protoc
 
 # Override default GOBIN and GOCACHE
 export GOBIN=/usr/local/bin GOCACHE=/tmp/gocache
 
 # Install golangci-lint
-curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOBIN v1.42.1
+curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOBIN v1.46.2
 
 # Install protobuf and testing/dev tools.
 # Note: The version of golang/protobuf is partially tied to the version of grpc
 # used by Boulder overall. Updating it may require updating the grpc version
 # and vice versa.
-go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26.0
-go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1.0
+go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.0
+go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2.0
 go install bitbucket.org/liamstask/goose/cmd/goose@latest
 go install golang.org/x/tools/cmd/stringer@latest
 go install github.com/letsencrypt/pebble/cmd/pebble-challtestsrv@master
@@ -54,9 +54,13 @@ go clean -modcache
 
 pip3 install -r /tmp/requirements.txt
 
-gem install --no-document -v 1.14.0 fpm
+gem install --no-document -v 1.14.2 fpm
 
 apt-get autoremove -y libssl-dev ruby-dev cmake pkg-config libtool autoconf automake
 apt-get clean -y
 
+# Tell git to trust the directory where the boulder repo volume is mounted
+# by docker-compose.
+git config --global --add safe.directory /boulder
+
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

test/startservers.py

@@ -156,11 +156,11 @@ def install(race_detection):
     # Pass empty BUILD_TIME and BUILD_ID flags to avoid constantly invalidating the
     # build cache with new BUILD_TIMEs, or invalidating it on merges with a new
     # BUILD_ID.
-    cmd = "/usr/bin/make GO_BUILD_FLAGS='-tags \"integration\"'  "
+    go_build_flags='-tags "integration"'
     if race_detection:
-        cmd = "/usr/bin/make GO_BUILD_FLAGS='-race -tags \"integration\"'"
+        go_build_flags += ' -race'
 
-    return subprocess.call(cmd, shell=True) == 0
+    return subprocess.call(["/usr/bin/make", "GO_BUILD_FLAGS=%s" % go_build_flags]) == 0
 
 def run(cmd, fakeclock):
     e = os.environ.copy()