Fix sawgger gen output dir (cosmos#7374)

* Fix sawgger gen output dir * Fix lint * Update make clean Co-authored-by: Alessio Treglia <alessio@tendermint.com>
bianjieai · Sep 27, 2020 · 3627bc6 · 3627bc6
1 parent 4bec834
commit 3627bc6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/Makefile b/Makefile
@@ -145,7 +145,8 @@ distclean: clean
 clean:
 	rm -rf \
     $(BUILDDIR)/ \
-    artifacts/
+    artifacts/ \
+    tmp-swagger-gen/
 
 .PHONY: distclean clean
 

diff --git a/client/docs/config.json b/client/docs/config.json
@@ -13,71 +13,71 @@
       }
     },
     {
-      "url": "./cosmos/auth/v1beta1/query.swagger.json",
+      "url": "./tmp-swagger-gen/cosmos/auth/v1beta1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "AuthParams"
         }
       }
     },
     {
-      "url": "./cosmos/bank/v1beta1/query.swagger.json",
+      "url": "./tmp-swagger-gen/cosmos/bank/v1beta1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "BankParams"
         }
       }
     },
     {
-      "url": "./cosmos/distribution/v1beta1/query.swagger.json",
+      "url": "./tmp-swagger-gen/cosmos/distribution/v1beta1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "DistributionParams"
         }
       }
     },
     {
-      "url": "./cosmos/evidence/v1beta1/query.swagger.json",
+      "url": "./tmp-swagger-gen/cosmos/evidence/v1beta1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "EvidenceParams"
         }
       }
     },
     {
-      "url": "./cosmos/gov/v1beta1/query.swagger.json",
+      "url": "./tmp-swagger-gen/cosmos/gov/v1beta1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "GovParams"
         }
       }
     },
     {
-      "url": "./cosmos/mint/v1beta1/query.swagger.json",
+      "url": "./tmp-swagger-gen/cosmos/mint/v1beta1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "MintParams"
         }
       }
     },
     {
-      "url": "./cosmos/params/v1beta1/query.swagger.json",
+      "url": "./tmp-swagger-gen/cosmos/params/v1beta1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "Params"
         }
       }
     },
     {
-      "url": "./cosmos/slashing/v1beta1/query.swagger.json",
+      "url": "./tmp-swagger-gen/cosmos/slashing/v1beta1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "SlashingParams"
         }
       }
     },
     {
-      "url": "./cosmos/staking/v1beta1/query.swagger.json",
+      "url": "./tmp-swagger-gen/cosmos/staking/v1beta1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "StakingParams",
@@ -86,39 +86,39 @@
       }
     },
     {
-      "url": "./cosmos/upgrade/v1beta1/query.swagger.json",
+      "url": "./tmp-swagger-gen/cosmos/upgrade/v1beta1/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "UpgradeParams"
         }
       }
     },
     {
-      "url": "./ibc/channel/query.swagger.json",
+      "url": "./tmp-swagger-gen/ibc/channel/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "IBCChannelParams"
         }
       }
     },
     {
-      "url": "./ibc/client/query.swagger.json",
+      "url": "./tmp-swagger-gen/ibc/client/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "IBCClientParams"
         }
       }
     },
     {
-      "url": "./ibc/connection/query.swagger.json",
+      "url": "./tmp-swagger-gen/ibc/connection/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "IBCConnectionParams"
         }
       }
     },
     {
-      "url": "./ibc/transfer/query.swagger.json",
+      "url": "./tmp-swagger-gen/ibc/transfer/query.swagger.json",
       "operationIds": {
         "rename": {
           "Params": "IBCTransferParams"

diff --git a/scripts/protoc-swagger-gen.sh b/scripts/protoc-swagger-gen.sh
@@ -2,6 +2,7 @@
 
 set -eo pipefail
 
+mkdir -p ./tmp-swagger-gen
 proto_dirs=$(find ./proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
 for dir in $proto_dirs; do
 
@@ -12,7 +13,8 @@ for dir in $proto_dirs; do
     -I "proto" \
     -I "third_party/proto" \
     "$query_file" \
-    --swagger_out=logtostderr=true,stderrthreshold=1000,fqn_for_swagger_name=true,simple_operation_ids=true:.
+    --swagger_out ./tmp-swagger-gen \
+    --swagger_opt logtostderr=true --swagger_opt fqn_for_swagger_name=true --swagger_opt simple_operation_ids=true
   fi
 done
 
@@ -22,5 +24,4 @@ done
 swagger-combine ./client/docs/config.json -o ./client/docs/swagger-ui/swagger.yaml -f yaml --continueOnConflictingPaths true --includeDefinitions true
 
 # clean swagger files
-rm -rf cosmos
-rm -rf ibc
+rm -rf ./tmp-swagger-gen