Commit ca8bf64
committed
Support openapiv2 proto annotations from sdk-core#1172
sdk-core added protoc-gen-openapiv2 imports to cloud service protos.
This broke proto generation in two ways:
1. protoc couldn't resolve the import — none of the existing --proto_path
entries point to a directory where protoc-gen-openapiv2/ is a child.
Fix: add protos/ as --proto_path, but only for the cloud protos call
(via extra_proto_paths param). Adding it globally causes duplicate
definition errors since files under api_upstream/ become reachable
through both protos/api_upstream and protos/.
2. The generated service.rb requires the openapiv2 Ruby files, which
didn't exist. generate_service_files loads service.rb to reflect on
the service descriptor, so the missing require crashes the build.
Fix: generate openapiv2 protos into lib/protoc-gen-openapiv2/.
Mirrors sdk-dotnet#633.1 parent 32bed58 commit ca8bf64
15 files changed
Lines changed: 493 additions & 9 deletions
File tree
- temporalio
- extra
- ext/src
- lib
- protoc-gen-openapiv2/options
- temporalio
- api
- cloud
- account/v1
- auditlog/v1
- billing/v1
- cloudservice/v1
- namespace/v1
- client/connection
- internal/bridge/api/activity_task
- sig/temporalio/client/connection
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
976 | 976 | | |
977 | 977 | | |
978 | 978 | | |
| 979 | + | |
| 980 | + | |
| 981 | + | |
| 982 | + | |
| 983 | + | |
| 984 | + | |
| 985 | + | |
| 986 | + | |
979 | 987 | | |
980 | 988 | | |
981 | 989 | | |
| |||
984 | 992 | | |
985 | 993 | | |
986 | 994 | | |
| 995 | + | |
| 996 | + | |
| 997 | + | |
| 998 | + | |
| 999 | + | |
| 1000 | + | |
| 1001 | + | |
| 1002 | + | |
987 | 1003 | | |
988 | 1004 | | |
989 | 1005 | | |
| |||
1040 | 1056 | | |
1041 | 1057 | | |
1042 | 1058 | | |
| 1059 | + | |
| 1060 | + | |
| 1061 | + | |
| 1062 | + | |
| 1063 | + | |
| 1064 | + | |
| 1065 | + | |
| 1066 | + | |
1043 | 1067 | | |
1044 | 1068 | | |
1045 | 1069 | | |
| |||
1128 | 1152 | | |
1129 | 1153 | | |
1130 | 1154 | | |
| 1155 | + | |
| 1156 | + | |
| 1157 | + | |
| 1158 | + | |
| 1159 | + | |
| 1160 | + | |
| 1161 | + | |
| 1162 | + | |
| 1163 | + | |
| 1164 | + | |
| 1165 | + | |
| 1166 | + | |
| 1167 | + | |
| 1168 | + | |
| 1169 | + | |
| 1170 | + | |
1131 | 1171 | | |
1132 | 1172 | | |
1133 | 1173 | | |
| |||
1152 | 1192 | | |
1153 | 1193 | | |
1154 | 1194 | | |
| 1195 | + | |
| 1196 | + | |
| 1197 | + | |
| 1198 | + | |
| 1199 | + | |
| 1200 | + | |
| 1201 | + | |
| 1202 | + | |
| 1203 | + | |
| 1204 | + | |
| 1205 | + | |
| 1206 | + | |
| 1207 | + | |
| 1208 | + | |
| 1209 | + | |
| 1210 | + | |
1155 | 1211 | | |
1156 | 1212 | | |
1157 | 1213 | | |
| |||
1168 | 1224 | | |
1169 | 1225 | | |
1170 | 1226 | | |
| 1227 | + | |
| 1228 | + | |
| 1229 | + | |
| 1230 | + | |
| 1231 | + | |
| 1232 | + | |
| 1233 | + | |
| 1234 | + | |
1171 | 1235 | | |
1172 | 1236 | | |
1173 | 1237 | | |
| |||
1176 | 1240 | | |
1177 | 1241 | | |
1178 | 1242 | | |
| 1243 | + | |
| 1244 | + | |
| 1245 | + | |
| 1246 | + | |
| 1247 | + | |
| 1248 | + | |
| 1249 | + | |
| 1250 | + | |
1179 | 1251 | | |
1180 | 1252 | | |
1181 | 1253 | | |
| |||
1329 | 1401 | | |
1330 | 1402 | | |
1331 | 1403 | | |
| 1404 | + | |
| 1405 | + | |
| 1406 | + | |
| 1407 | + | |
| 1408 | + | |
| 1409 | + | |
| 1410 | + | |
| 1411 | + | |
1332 | 1412 | | |
1333 | 1413 | | |
1334 | 1414 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
320 | 320 | | |
321 | 321 | | |
322 | 322 | | |
323 | | - | |
| 323 | + | |
| 324 | + | |
324 | 325 | | |
325 | 326 | | |
326 | 327 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
16 | 20 | | |
17 | 21 | | |
18 | 22 | | |
| |||
24 | 28 | | |
25 | 29 | | |
26 | 30 | | |
27 | | - | |
| 31 | + | |
28 | 32 | | |
29 | 33 | | |
30 | 34 | | |
| |||
36 | 40 | | |
37 | 41 | | |
38 | 42 | | |
| 43 | + | |
39 | 44 | | |
40 | 45 | | |
41 | 46 | | |
| |||
57 | 62 | | |
58 | 63 | | |
59 | 64 | | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
60 | 81 | | |
61 | 82 | | |
62 | 83 | | |
| |||
Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments