Merge PR #5088: Swagger Auto Gen - Gov Updates

cosmos · Sep 30, 2019 · 93f82a5 · 93f82a5
1 parent f63e1a6
commit 93f82a5
Show file tree

Hide file tree

Showing 9 changed files with 1,173 additions and 221 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -162,18 +162,18 @@ jobs:
           name: upload
           command: bash <(curl -s https://codecov.io/bash) -f coverage.txt
 
-  update-swagger-docs:
+  verify-swagger-docs:
     executor: golang
     steps:
       - make:
-          target: update-swagger-docs
-          description: "Check if Swagger docs are up-to-date"
+          target: verify-swagger-docs
+          description: "Verify Swagger docs are up-to-date"
 
 workflows:
   version: 2
   test-suite:
     jobs:
-      - update-swagger-docs:
+      - verify-swagger-docs:
           requires:
             - setup-dependencies
       - setup-dependencies:

diff --git a/Makefile b/Makefile
@@ -24,9 +24,13 @@ build: go.sum
 .PHONY: build
 
 update-swagger-docs: swag
-	@scripts/swag.sh $(BINDIR)/swag
+	$(BINDIR)/swag init -g client/rest/root.go --output client/rest/docs
 .PHONY: update-swagger-docs
 
+verify-swagger-docs: swag
+	@scripts/swag.sh $(BINDIR)/swag
+.PHONY: verify-swagger-docs
+
 mocks: $(MOCKS_DIR)
 	mockgen -source=x/auth/types/account_retriever.go -package mocks -destination tests/mocks/account_retriever.go
 .PHONY: mocks

diff --git a/client/rest/docs/docs.go b/client/rest/docs/docs.go
diff --git a/client/rest/docs/swagger.json b/client/rest/docs/swagger.json