Skip to content
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.

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

Modify netty-shaded resources to reference shaded class names #8258

Merged
merged 3 commits into from
Jun 16, 2021

Conversation

dzou
Copy link
Contributor

@dzou dzou commented Jun 14, 2021

This modifies the shading operation to transform native-image resources so they correctly reference shaded class names.

Fixes #7540.

cc/ @meltsufin

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Jun 14, 2021

CLA Signed

The committers are authorized under a signed CLA.

Copy link
Contributor

@voidzcy voidzcy left a comment

Choose a reason for hiding this comment

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

LGTM

@voidzcy voidzcy requested a review from ejona86 June 16, 2021 09:22
@Test
public void nettyResourcesUpdated() throws IOException {
InputStream inputStream = NettyChannelBuilder.class.getClassLoader()
.getResourceAsStream("META-INF/native-image/io.netty/transport/reflection-config.json");
Copy link
Member

Choose a reason for hiding this comment

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

We really ought to rename the files as well (the "io.netty" folder), to avoid them colliding with Netty's files. But we can do that as a follow-up.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Gotcha, will do.

@ejona86 ejona86 added the kokoro:run Add this label to a PR to tell Kokoro the code is safe and tests can be run label Jun 16, 2021
@grpc-kokoro grpc-kokoro removed the kokoro:run Add this label to a PR to tell Kokoro the code is safe and tests can be run label Jun 16, 2021
@ejona86 ejona86 merged commit dc74a31 into grpc:master Jun 16, 2021
@ejona86
Copy link
Member

ejona86 commented Jun 16, 2021

@dzou, thank you!

@dzou
Copy link
Contributor Author

dzou commented Jun 16, 2021

@dzou, thank you!

Thanks for the quick review!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Apply package name shading to native-image config files in grpc-netty-shaded
4 participants