format: add format fix for java proto options#5516
Merged
Conversation
added 2 commits
January 7, 2019 11:15
Allows running tools/check_format.py fix to insert the necessary java proto options. Signed-off-by: Snow Pettersen <snowp@squareup.com>
Contributor
Author
|
/assign @jmarantz |
|
This pull request has been automatically marked as stale because it has not had activity in the last 7 days. It will be closed in 7 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions! |
stale
Bot
added
the
stale
Contributor
Author
|
@jmarantz You wanna give this one a look? |
stale
Bot
removed
the
stale
jmarantz
reviewed
Jan 15, 2019
| package_name = None | ||
| for line in fileinput.FileInput(file_path): | ||
| if line.startswith("package "): | ||
| package_name = re.compile("package (.*);").search(line).group(1) |
Contributor
There was a problem hiding this comment.
Can you compile the regex at global scope?
| infile = os.path.join(src, filename) | ||
| directory = os.path.dirname(filename) | ||
| if not directory == '' and not os.path.isdir(directory): | ||
| os.makedirs(directory) |
Contributor
There was a problem hiding this comment.
I'm curious why this is needed. If there's a filename reaching here, shouldn't we expect the directory to exist?
Contributor
Author
There was a problem hiding this comment.
At the time I added it because I had issues with the fact that the test file is api/java_options.proto and requires api to exist, but seems like I can remove this and it still works.
Contributor
Author
There was a problem hiding this comment.
The other mkdirs is necessary though to avoid:
diff proto_format.proto /source/tools/testdata/check_format/proto_format.proto.gold
Traceback (most recent call last):
File "./tools/check_format_test_helper.py", line 215, in <module>
errors += checkAndFixError("api/java_options.proto", "Java proto option")
File "./tools/check_format_test_helper.py", line 126, in checkAndFixError
errors = checkFileExpectingError(filename, expected_substring)
File "./tools/check_format_test_helper.py", line 121, in checkFileExpectingError
command, status, stdout = runCheckFormat("check", getInputFile(filename))
File "./tools/check_format_test_helper.py", line 55, in getInputFile
shutil.copyfile(infile, filename)
File "/usr/lib/python2.7/shutil.py", line 83, in copyfile
with open(dst, 'wb') as fdst:
IOError: [Errno 2] No such file or directory: 'api/java_options.proto'
Signed-off-by: Snow Pettersen <snowp@squareup.com>
jmarantz
reviewed
Jan 17, 2019
added 3 commits
January 16, 2019 20:32
Signed-off-by: Snow Pettersen <snowp@squareup.com>
Signed-off-by: Snow Pettersen <snowp@squareup.com>
Signed-off-by: Snow Pettersen <snowp@squareup.com>
jmarantz
approved these changes
Jan 17, 2019
mattklein123
approved these changes
Jan 17, 2019
fredlas
pushed a commit
to fredlas/envoy
that referenced
this pull request
Mar 5, 2019
Allows running tools/check_format.py fix to insert the necessary java proto options. Signed-off-by: Snow Pettersen <snowp@squareup.com> Signed-off-by: Fred Douglas <fredlas@google.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Allows running tools/check_format.py fix to insert the necessary java
proto options.
Signed-off-by: Snow Pettersen snowp@squareup.com
Risk Level: Low
Testing: Added check_format_test
Docs Changes: n/a
Release Notes: n/a
Fixes #5477