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

Generate import mappings. #635

Merged
merged 1 commit into from
May 7, 2018
Merged

Conversation

ensonic
Copy link
Contributor

@ensonic ensonic commented Apr 30, 2018

Instead of generating a list of import paths based on the difnames of the
imported protos, generate maps to the package local names. This is needed to
handle the case of packages containing a proto with the same name.

An example here is the annotation.proto in this module.

Fixes #633

@ensonic
Copy link
Contributor Author

ensonic commented Apr 30, 2018

This contains #632

If that is handled, I can rebase this one if needed.

@codecov-io
Copy link

codecov-io commented Apr 30, 2018

Codecov Report

Merging #635 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #635   +/-   ##
=======================================
  Coverage   58.94%   58.94%           
=======================================
  Files          30       30           
  Lines        2857     2857           
=======================================
  Hits         1684     1684           
  Misses       1010     1010           
  Partials      163      163

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dca8693...7c12a48. Read the comment docs.

@achew22
Copy link
Collaborator

achew22 commented Apr 30, 2018

This looks good to me. Let's merge #632, rebase this and then merge. Does that sound okay to you?

@ensonic
Copy link
Contributor Author

ensonic commented Apr 30, 2018

Thanks for the quick review. Will get to it on Wed - tomorrow is public holliday and I am off the computer :)

@achew22
Copy link
Collaborator

achew22 commented May 4, 2018

Did you have any luck with this?

@ensonic
Copy link
Contributor Author

ensonic commented May 4, 2018

Yes, it is still blocked on the discussion in #632.

@achew22
Copy link
Collaborator

achew22 commented May 5, 2018

That has now been merged. Could you rebase this?

@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@googlebot googlebot added cla: no and removed cla: yes labels May 7, 2018
@ensonic
Copy link
Contributor Author

ensonic commented May 7, 2018

Thanks, rebased.

Instead of generating a list of import paths based on the difnames of the
imported protos, generate maps to the package local names. This is needed to
handle the case of packages containing a proto with the same name.

An example here is the annotation.proto in this module.

Fixes grpc-ecosystem#633
@googlebot
Copy link

CLAs look good, thanks!

@googlebot googlebot added cla: yes and removed cla: no labels May 7, 2018
@ensonic
Copy link
Contributor Author

ensonic commented May 7, 2018

Travis might have some infrastructure failure, I don't see any build output:

bazel test //...
INFO: Analysed 48 targets (27 packages loaded).
INFO: Found 38 targets and 10 test targets...
INFO: Elapsed time: 19.793s, Critical Path: 16.84s
INFO: 196 processes: 182 linux-sandbox, 14 local.
INFO: Build completed successfully, 212 total actions
//codegenerator:go_default_xtest                                         PASSED in 0.2s
//examples/integration:go_default_xtest                                  PASSED in 0.6s
//protoc-gen-grpc-gateway/descriptor:go_default_test                     PASSED in 0.2s
//protoc-gen-grpc-gateway/gengateway:go_default_test                     PASSED in 0.2s
//protoc-gen-grpc-gateway/httprule:go_default_test                       PASSED in 0.5s
//protoc-gen-swagger:go_default_test                                     PASSED in 0.1s
//protoc-gen-swagger/genswagger:go_default_test                          PASSED in 0.2s
//runtime:go_default_test                                                PASSED in 0.2s
//runtime:go_default_xtest                                               PASSED in 0.3s
//utilities:go_default_xtest                                             PASSED in 0.2s

Executed 10 out of 10 tests: 10 tests pass.
There were tests whose specified size is too big. Use the --test_verbose_timeout_warnings command line option to see which ones these are.

@achew22 achew22 merged commit 2dc0f3e into grpc-ecosystem:master May 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants