Skip to content

Commit 5f14ead

Browse files
rshriramrshriram
authored
Generate separate HTML page per proto under networking (#811)
* Generate separate pages for each networking proto Signed-off-by: Shriram Rajagopalan <[email protected]> * update Signed-off-by: Shriram Rajagopalan <[email protected]> * tweaks Signed-off-by: Shriram Rajagopalan <[email protected]> * Fix interdoc references * separate doc and go gen * change dash to underscore * fix * more fixes * makefile fix Signed-off-by: Shriram Rajagopalan <[email protected]> * remove bad target * Revert "change dash to underscore" This reverts commit 7fbced6. * final update Signed-off-by: Shriram Rajagopalan <[email protected]>
1 parent 2f783de commit 5f14ead

21 files changed

+4838
-5394
lines changed

‎Makefile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ gogoslick_plugin := $(gogoslick_plugin_prefix)$(gogo_mapping):$(out_path)
7070
########################
7171

7272
protoc_gen_docs_plugin := --docs_out=warnings=true,mode=html_fragment_with_front_matter:$(repo_dir)/
73+
protoc_gen_docs_plugin_for_networking := --docs_out=warnings=true,per_file=true,mode=html_fragment_with_front_matter:$(repo_dir)/
7374

7475
#####################
7576
# Generation Rules
@@ -239,14 +240,14 @@ routing_v1alpha3_path := networking/v1alpha3
239240
routing_v1alpha3_protos := $(shell find networking/v1alpha3 -type f -name '*.proto' | sort)
240241
routing_v1alpha3_pb_gos := $(routing_v1alpha3_protos:.proto=.pb.go)
241242
routing_v1alpha3_pb_pythons := $(routing_v1alpha3_protos:.proto=_pb2.py)
242-
routing_v1alpha3_pb_doc := $(routing_v1alpha3_path)/istio.routing.v1alpha3.pb.html
243+
routing_v1alpha3_pb_docs := $(routing_v1alpha3_protos:.proto=.pb.html)
243244

244-
generate-routing-go: $(routing_v1alpha3_pb_gos) $(routing_v1alpha3_pb_doc)
245+
generate-routing-go: $(routing_v1alpha3_pb_gos) $(routing_v1alpha3_pb_docs)
245246

246-
$(routing_v1alpha3_pb_gos) $(routing_v1alpha3_pb_doc): $(routing_v1alpha3_protos)
247+
$(routing_v1alpha3_pb_gos) $(routing_v1alpha3_pb_docs): $(routing_v1alpha3_protos)
247248
## Generate networking/v1alpha3/*.pb.go
248249
@$(docker_lock) status
249-
@$(docker_gen) $(gogofast_plugin) $(protoc_gen_docs_plugin)$(routing_v1alpha3_path) $^
250+
@$(docker_gen) $(gogofast_plugin) $(protoc_gen_docs_plugin_for_networking)$(routing_v1alpha3_path) $^
250251

251252
generate-routing-python: $(routing_v1alpha3_pb_pythons)
252253

@@ -257,7 +258,7 @@ $(routing_v1alpha3_pb_pythons): $(routing_v1alpha3_protos)
257258

258259
clean-routing:
259260
rm -f $(routing_v1alpha3_pb_gos)
260-
rm -f $(routing_v1alpha3_pb_doc)
261+
rm -f $(routing_v1alpha3_pb_docs)
261262

262263
#####################
263264
# rbac/...

‎mesh/v1alpha1/istio.mesh.v1alpha1.pb.html‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎networking/v1alpha3/destination_rule.pb.go‎

Lines changed: 73 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)