From 91ffba64e697c456ac5bc94b38c9a05277d139d4 Mon Sep 17 00:00:00 2001
From: "R.B. Boyer" <rb@hashicorp.com>
Date: Mon, 3 Feb 2020 10:12:26 -0600
Subject: [PATCH] add 'make go-mod-tidy' to serially run tidy on all submodules
 in the correct order (#7179)

- also make go-mod-tidy a dependency of update-vendor
---
 GNUmakefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index 042e52e47..1372e53e8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -219,7 +219,13 @@ test: other-consul dev-build vet test-install-deps test-internal
 test-install-deps:
 	go test -tags '$(GOTAGS)' -i $(GOTEST_PKGS)
 
-update-vendor:
+go-mod-tidy:
+	@echo "--> Running go mod tidy"
+	@cd sdk && go mod tidy
+	@cd api && go mod tidy
+	@go mod tidy
+
+update-vendor: go-mod-tidy
 	@echo "--> Running go mod vendor"
 	@go mod vendor
 	@echo "--> Removing vendoring of our own nested modules"