Merge branch 'run-go-mod-tidy' into 'master'

Run go mod tidy NO CHANGELOG

See merge request gitlab-org/gitlab-workhorse!630

Makefile

@@ -116,7 +116,7 @@ testdata/scratch:
 	mkdir -p testdata/scratch
 
 .PHONY: verify
-verify: lint vet detect-context detect-assert check-formatting staticcheck
+verify: lint vet detect-context detect-assert check-formatting staticcheck deps-check
 
 .PHONY: lint
 lint: $(TARGET_SETUP)
@@ -164,3 +164,14 @@ fmt: $(TARGET_SETUP) install-goimports
 install-goimports:	$(TARGET_SETUP)
 	$(call message,$@)
 	go install golang.org/x/tools/cmd/goimports
+
+.PHONY: deps-check
+deps-check:
+	go mod tidy
+	@if git diff --quiet --exit-code -- go.mod go.sum; then \
+		echo "go.mod and go.sum are ok"; \
+	else \
+		echo ""; \
+		echo "go.mod and go.sum are modified, please commit them";\
+		exit 1; \
+	fi;

go.mod

@@ -34,7 +34,6 @@ require (
 	golang.org/x/net v0.0.0-20200602114024-627f9648deb9
 	golang.org/x/tools v0.0.0-20200608174601-1b747fd94509
 	google.golang.org/grpc v1.29.1
-	gopkg.in/yaml.v2 v2.2.8 // indirect
 	honnef.co/go/tools v0.0.1-2020.1.5
 )