Skip to content

Commit a722933

Browse files
anilcseAlessio Treglia
and
Alessio Treglia
authored
Fix sawgger gen output dir (#7374)
* Fix sawgger gen output dir * Fix lint * Update make clean Co-authored-by: Alessio Treglia <alessio@tendermint.com>
1 parent 59c43cd commit a722933

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,8 @@ distclean: clean
147147
clean:
148148
rm -rf \
149149
$(BUILDDIR)/ \
150-
artifacts/
150+
artifacts/ \
151+
tmp-swagger-gen/
151152

152153
.PHONY: distclean clean
153154

client/docs/config.json

+14-14
Original file line numberDiff line numberDiff line change
@@ -13,71 +13,71 @@
1313
}
1414
},
1515
{
16-
"url": "./cosmos/auth/v1beta1/query.swagger.json",
16+
"url": "./tmp-swagger-gen/cosmos/auth/v1beta1/query.swagger.json",
1717
"operationIds": {
1818
"rename": {
1919
"Params": "AuthParams"
2020
}
2121
}
2222
},
2323
{
24-
"url": "./cosmos/bank/v1beta1/query.swagger.json",
24+
"url": "./tmp-swagger-gen/cosmos/bank/v1beta1/query.swagger.json",
2525
"operationIds": {
2626
"rename": {
2727
"Params": "BankParams"
2828
}
2929
}
3030
},
3131
{
32-
"url": "./cosmos/distribution/v1beta1/query.swagger.json",
32+
"url": "./tmp-swagger-gen/cosmos/distribution/v1beta1/query.swagger.json",
3333
"operationIds": {
3434
"rename": {
3535
"Params": "DistributionParams"
3636
}
3737
}
3838
},
3939
{
40-
"url": "./cosmos/evidence/v1beta1/query.swagger.json",
40+
"url": "./tmp-swagger-gen/cosmos/evidence/v1beta1/query.swagger.json",
4141
"operationIds": {
4242
"rename": {
4343
"Params": "EvidenceParams"
4444
}
4545
}
4646
},
4747
{
48-
"url": "./cosmos/gov/v1beta1/query.swagger.json",
48+
"url": "./tmp-swagger-gen/cosmos/gov/v1beta1/query.swagger.json",
4949
"operationIds": {
5050
"rename": {
5151
"Params": "GovParams"
5252
}
5353
}
5454
},
5555
{
56-
"url": "./cosmos/mint/v1beta1/query.swagger.json",
56+
"url": "./tmp-swagger-gen/cosmos/mint/v1beta1/query.swagger.json",
5757
"operationIds": {
5858
"rename": {
5959
"Params": "MintParams"
6060
}
6161
}
6262
},
6363
{
64-
"url": "./cosmos/params/v1beta1/query.swagger.json",
64+
"url": "./tmp-swagger-gen/cosmos/params/v1beta1/query.swagger.json",
6565
"operationIds": {
6666
"rename": {
6767
"Params": "Params"
6868
}
6969
}
7070
},
7171
{
72-
"url": "./cosmos/slashing/v1beta1/query.swagger.json",
72+
"url": "./tmp-swagger-gen/cosmos/slashing/v1beta1/query.swagger.json",
7373
"operationIds": {
7474
"rename": {
7575
"Params": "SlashingParams"
7676
}
7777
}
7878
},
7979
{
80-
"url": "./cosmos/staking/v1beta1/query.swagger.json",
80+
"url": "./tmp-swagger-gen/cosmos/staking/v1beta1/query.swagger.json",
8181
"operationIds": {
8282
"rename": {
8383
"Params": "StakingParams",
@@ -86,39 +86,39 @@
8686
}
8787
},
8888
{
89-
"url": "./cosmos/upgrade/v1beta1/query.swagger.json",
89+
"url": "./tmp-swagger-gen/cosmos/upgrade/v1beta1/query.swagger.json",
9090
"operationIds": {
9191
"rename": {
9292
"Params": "UpgradeParams"
9393
}
9494
}
9595
},
9696
{
97-
"url": "./ibc/channel/query.swagger.json",
97+
"url": "./tmp-swagger-gen/ibc/channel/query.swagger.json",
9898
"operationIds": {
9999
"rename": {
100100
"Params": "IBCChannelParams"
101101
}
102102
}
103103
},
104104
{
105-
"url": "./ibc/client/query.swagger.json",
105+
"url": "./tmp-swagger-gen/ibc/client/query.swagger.json",
106106
"operationIds": {
107107
"rename": {
108108
"Params": "IBCClientParams"
109109
}
110110
}
111111
},
112112
{
113-
"url": "./ibc/connection/query.swagger.json",
113+
"url": "./tmp-swagger-gen/ibc/connection/query.swagger.json",
114114
"operationIds": {
115115
"rename": {
116116
"Params": "IBCConnectionParams"
117117
}
118118
}
119119
},
120120
{
121-
"url": "./ibc/transfer/query.swagger.json",
121+
"url": "./tmp-swagger-gen/ibc/transfer/query.swagger.json",
122122
"operationIds": {
123123
"rename": {
124124
"Params": "IBCTransferParams"

scripts/protoc-swagger-gen.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
set -eo pipefail
44

5+
mkdir -p ./tmp-swagger-gen
56
proto_dirs=$(find ./proto -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
67
for dir in $proto_dirs; do
78

@@ -12,7 +13,8 @@ for dir in $proto_dirs; do
1213
-I "proto" \
1314
-I "third_party/proto" \
1415
"$query_file" \
15-
--swagger_out=logtostderr=true,stderrthreshold=1000,fqn_for_swagger_name=true,simple_operation_ids=true:.
16+
--swagger_out ./tmp-swagger-gen \
17+
--swagger_opt logtostderr=true --swagger_opt fqn_for_swagger_name=true --swagger_opt simple_operation_ids=true
1618
fi
1719
done
1820

@@ -22,5 +24,4 @@ done
2224
swagger-combine ./client/docs/config.json -o ./client/docs/swagger-ui/swagger.yaml -f yaml --continueOnConflictingPaths true --includeDefinitions true
2325

2426
# clean swagger files
25-
rm -rf cosmos
26-
rm -rf ibc
27+
rm -rf ./tmp-swagger-gen

0 commit comments

Comments
 (0)