Skip to content

Conversation

jackkleeman
Copy link
Member

The json generation stuff is gogo, but the operator proto is golang. This is causing issues.
Fixes istio/istio#20986

@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Feb 11, 2020
@istio-policy-bot
Copy link

🤔 🐛 You appear to be fixing a bug in Go code, yet your PR doesn't include updates to any test files. Did you forget to add a test?

Courtesy of your friendly test nag.

@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 11, 2020
@hzxuzhonghu
Copy link
Member

/test build_api

Copy link
Member

@howardjohn howardjohn left a comment

Choose a reason for hiding this comment

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

are the operator protos in golang proto? because they reference mesh config, which is in gogo, which may cause issues

@@ -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.

@jackkleeman
Copy link
Member Author

The operator protos are in golang, and changing this seems not super easy due to GOTYPE

@jackkleeman
Copy link
Member Author

It would be preferable to move operator to gogo, but I think that will require some surgery. I don't really understand the GOTYPE stuff we are doing and why its needed

@istio-testing istio-testing merged commit 6fa980c into istio:master Feb 12, 2020
@jackkleeman jackkleeman deleted the fix-json-operator branch February 12, 2020 14:20
ostromart pushed a commit to ostromart/api that referenced this pull request Mar 16, 2020
istio-testing pushed a commit that referenced this pull request Mar 16, 2020
Co-authored-by: Jack Kleeman <jackkleeman@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TestIOPController_SwitchProfile failed after bump istio api
8 participants