VOL-2265 test go.mod and vendor consistency;
Fix go.mod go-resiliency import no longer indirect;
Return to dev version

Change-Id: I2b6edbe0b933b5ce34cdca8f693dcf96cef03daa
diff --git a/Makefile b/Makefile
index dba48ec..5edab32 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,16 @@
 lint-mod:
 	@echo "Running dependency check..."
 	@go mod verify
-	@echo "Dependency check OK"
+	@echo "Dependency check OK. Running vendor check..."
+	@git status > /dev/null
+	@git diff-index --quiet HEAD -- go.mod go.sum vendor || (echo "ERROR: Staged or modified files must be committed before running this test" && echo "`git status`" && exit 1)
+	@[[ `git ls-files --exclude-standard --others go.mod go.sum vendor` == "" ]] || (echo "ERROR: Untracked files must be cleaned up before running this test" && echo "`git status`" && exit 1)
+	go mod tidy
+	go mod vendor
+	@git status > /dev/null
+	@git diff-index --quiet HEAD -- go.mod go.sum vendor || (echo "ERROR: Modified files detected after running go mod tidy / go mod vendor" && echo "`git status`" && exit 1)
+	@[[ `git ls-files --exclude-standard --others go.mod go.sum vendor` == "" ]] || (echo "ERROR: Untracked files detected after running go mod tidy / go mod vendor" && echo "`git status`" && exit 1)
+	@echo "Vendor check OK."
 
 lint: lint-style lint-sanity lint-mod