Fix conversion-gen handling of unexported fields and custom conversions of pointers #133325
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… slices of pointers
276db88 to
66f7e30
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: liggitt The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
liggitt
commented
Jul 30, 2025
| @@ -130,6 +140,28 @@ func Convert_example_Conversion_To_v1_Conversion(in *example.Conversion, out *Co | |||
| return autoConvert_example_Conversion_To_v1_Conversion(in, out, s) | |||
| } | |||
|
|
|||
| func autoConvert_v1_ConversionPrivate_To_example_ConversionPrivate(in *ConversionPrivate, out *example.ConversionPrivate, s conversion.Scope) error { | |||
| out.PublicField = in.PublicField | |||
| out.privateField = in.privateField | |||
There was a problem hiding this comment.
This is invalid and will fail to compile. The following commit fixes the generator to not produce this line.
liggitt
commented
Jul 30, 2025
| @@ -142,26 +142,16 @@ func Convert_example_Conversion_To_v1_Conversion(in *example.Conversion, out *Co | |||
|
|
|||
| func autoConvert_v1_ConversionPrivate_To_example_ConversionPrivate(in *ConversionPrivate, out *example.ConversionPrivate, s conversion.Scope) error { | |||
| out.PublicField = in.PublicField | |||
| out.privateField = in.privateField | |||
| // WARNING: out.privateField is not exported and cannot be set | |||
There was a problem hiding this comment.
This demonstrates the fixed generated conversion.
liggitt
commented
Jul 30, 2025
Comment on lines
191
to
192
| // FIXME: Provide conversion function to convert *ConversionCustom to *example.ConversionCustom | ||
| compileErrorOnMissingConversion() |
There was a problem hiding this comment.
These demonstrate the inability of the generated conversion to find the existing custom conversion function it should call here. The following commit fixes this.
|
/triage accepted |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
Allows conversion-gen to successfully generate conversions for protoc-generated types with unexpected state fields.
Prereq of #133026, see discussion thread in #133026 (comment)
Which issue(s) this PR is related to:
#96564
Does this PR introduce a user-facing change?
/sig api-machinery
/cc @saschagrunert