Table-setting for generating protos. #35
Merged
Conversation
This file contains 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
This commit makes several schema edits and additions in order to facilitate
generating pb2 replacements directly.
In particular, it:
* Adds support for a `$proto` rewrite for filenames (such files
receive a `proto` variable), and adds loader support for such.
* Refactors `Address` to include the `name` of the object it is
attached to, enabling it to be used as the `ident` object.
* Refactors the various `*_ident` properties into the address,
and re-orders template use (e.g. `sphinx_ident` is now
`ident.sphinx`).
* Additionally, `python_ident` is now just `ident` in templates.
* Adds a `rel` method for getting identifiers relative to the
file being generated. This deals with a problem that will surface
in replacing pb2s where a file would attempt to import or reference
itself.
LROs are slightly broken in a slightly different way than before
(note that they were broken in the status quo ante due to a bug
in `OperationType`), and `OperationType` turned out to be a mistake.
Filed #34 to track this, and it will be fixed after pb2 replacements
are introduced (since they will significantly alter what the fix is).
Codecov Report
@@ Coverage Diff @@
## master #35 +/- ##
=====================================
Coverage 100% 100%
=====================================
Files 15 15
Lines 522 552 +30
Branches 91 101 +10
=====================================
+ Hits 522 552 +30
Continue to review full report at Codecov.
|
lukesneeringer
pushed a commit
that referenced
this pull request
Sep 22, 2018
landrito
approved these changes
Sep 26, 2018
gapic/schema/api.py
Outdated
| """Return the appropriate module name for this service. | ||
|
|
||
| Returns: | ||
| str: The service name, in snake case. |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
gapic/schema/api.py
Outdated
|
|
||
| @cached_property | ||
| def top(self) -> 'Proto': | ||
| """Return a proto shim which is only aware of top-level objects.""" |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
gapic/schema/api.py
Outdated
| @@ -282,11 +305,17 @@ def _load_children(self, children: Sequence, loader: Callable, *, | |||
| path (Tuple[int]): The location path up to this point. This is | |||
| used to correspond to documentation in | |||
| ``SourceCodeInfo.Location`` in ``descriptor.proto``. | |||
|
|
|||
| Return: | |||
| Mapping: A sequence of the objects that were loaded. | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| ) | ||
|
|
||
| def rel(self, address: 'Address') -> str: |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
lukesneeringer
pushed a commit
that referenced
this pull request
Sep 30, 2018
lukesneeringer
pushed a commit
that referenced
this pull request
Oct 3, 2018
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.
This commit makes several schema edits and additions in order to facilitate generating pb2 replacements directly.
In particular, it:
$protorewrite for filenames (such files receive aprotovariable), and adds loader support for such.Addressto include thenameof the object it is attached to, enabling it to be used as theidentobject.*_identproperties into the address, and re-orders template use (e.g.sphinx_identis nowident.sphinx).python_identis now justidentin templates.relmethod for getting identifiers relative to the file being generated. This deals with a problem that will surface in replacing pb2s where a file would attempt to import or reference itself.LROs are slightly broken in a slightly different way than before (note that they were broken in the status quo ante due to a bug in
OperationType), andOperationTypeturned out to be a mistake. Filed #34 to track this, and it will be fixed after pb2 replacements are introduced (since they will significantly alter what the fix is).