Skip to content

Use golang protobuf in operator json generated code #1283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2020
Merged

Use golang protobuf in operator json generated code #1283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile.core.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ $(operator_v1alpha1_pb_gos) $(operator_v1alpha1_pb_doc) $(operator_v1alpha1_pb_p
@cp -r /tmp/istio.io/api/operator/* operator
@sed -i -E '/MarshalJSON is a custom marshaler for TypeMapStringInterface2/,+10d' $(operator_v1alpha1_path)/operator_json.gen.go
@sed -i -E '/MarshalJSON is a custom marshaler for TypeInterface2/,+10d' $(operator_v1alpha1_path)/operator_json.gen.go
@sed -i 's/gogo/golang/g' $(operator_v1alpha1_path)/operator_json.gen.go
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this feels like the wrong way to do this but I'm not a proto expert

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/istio/tools/tree/master/cmd/protoc-gen-jsonshim produces gogo:
https://github.com/istio/tools/blob/master/cmd/protoc-gen-jsonshim/jsonshim/plugin.go#L63
So theres no other way :(

@go run $(repo_dir)/operator/fixup_structs/main.go -f $(operator_v1alpha1_path)/component.pb.go
@go run $(repo_dir)/operator/fixup_structs/main.go -f $(operator_v1alpha1_path)/kubernetes.pb.go
@go run $(repo_dir)/operator/fixup_structs/main.go -f $(operator_v1alpha1_path)/operator.pb.go
Expand Down
10 changes: 5 additions & 5 deletions operator/v1alpha1/operator_json.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.