ci: ensure the generated code is up-to-date

See etcd-io#14612 (comment)
Signed-off-by: spacewander <[email protected]>

.github/workflows/static-analysis.yaml

@@ -12,5 +12,9 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           version: v1.49.0
+      - name: protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          version: '3.14.0'
       - run: make verify
       - run: make fix

Makefile

@@ -39,7 +39,9 @@ fuzz:
 
 # Static analysis
 
-verify: verify-gofmt verify-bom verify-lint verify-dep verify-shellcheck verify-goword verify-govet verify-license-header verify-receiver-name verify-mod-tidy verify-shellcheck verify-shellws verify-proto-annotations
+verify: verify-gofmt verify-bom verify-lint verify-dep verify-shellcheck verify-goword \
+	verify-govet verify-license-header verify-receiver-name verify-mod-tidy verify-shellcheck \
+	verify-shellws verify-proto-annotations verify-genproto
 fix: fix-bom fix-lint
 	./scripts/fix.sh
 
@@ -99,6 +101,10 @@ verify-shellws:
 verify-proto-annotations:
 	PASSES="proto_annotations" ./scripts/test.sh
 
+.PHONY: verify-genproto
+verify-genproto:
+	PASSES="genproto" ./scripts/test.sh
+
 
 # Cleanup
 

scripts/genproto.sh

@@ -49,7 +49,7 @@ for dir in ${DIRS}; do
 
     rm -f ./**/*.bak
     run gofmt -s -w ./**/*.pb.go
-    run goimports -w ./**/*.pb.go
+    run_go_tool "golang.org/x/tools/cmd/goimports" -w ./**/*.pb.go
   run popd
 done
 

scripts/test.sh

@@ -674,6 +674,10 @@ function proto_annotations_pass {
   "${ETCD_ROOT_DIR}/scripts/verify_proto_annotations.sh"
 }
 
+function genproto_pass {
+  "${ETCD_ROOT_DIR}/scripts/verify_genproto.sh"
+}
+
 ########### MAIN ###############################################################
 
 function run_pass {

scripts/verify_genproto.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# This scripts is automatically run by CI to prevent pull requests missing running genproto.sh
+# after changing *.proto file.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+./scripts/genproto.sh
+diff=$(git diff --name-only | grep -c ".pb.")
+if [ "$diff" -eq 0 ]; then
+  echo "PASSED genproto-verification!"
+  exit 0
+fi
+echo "Failed genproto-verification!" >&2
+echo "* Found changed files $(git diff --name-only | grep '.pb.')" >&2
+echo "* Please rerun genproto.sh after changing *.proto file" >&2
+echo "* Run ./scripts/genproto.sh" >&2
+exit 1

scripts/verify_proto_annotations.sh

@@ -15,6 +15,6 @@ fi
 echo "Failed proto-annotations-verification!" >&2
 echo "If you are adding new proto fields/messages that will be included in raft log:" >&2
 echo "* Please add etcd_version annotation in *.proto file with next etcd version" >&2
-echo "* Run ./scripts/getproto.sh" >&2
+echo "* Run ./scripts/genproto.sh" >&2
 echo "* Run ./scripts/update_proto_annotations.sh" >&2
 exit 1