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.

Sign up for GitHub

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

Verify protoc version for batch-generation #3676

Merged
merged 6 commits into from
Sep 13, 2018
Merged

Verify protoc version for batch-generation #3676

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3592c5f
add checks for protoc
andreamlin Sep 12, 2018
e207ff2
first implementaiton
andreamlin Sep 12, 2018
4f406f2
better error message
andreamlin Sep 12, 2018
713a76d
fixed swap of versions
andreamlin Sep 12, 2018
d4a3021
remove comment
andreamlin Sep 13, 2018
c597def
proto -> protoc
andreamlin Sep 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion utilities/batch_generate_apis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
# $ git clone https://github.com/googleapis/googleapis.git
# $ git clone https://github.com/googleapis/discovery-artifact-manager.git
#
# Run this script:
# Run this script from the top-level google-cloud-java directory:
#
# $ python utilities/batch_generate_apis.py PATH_TO_GOOGLEAPIS PATH_TO_DISCOVERY_ARTIFACT_MANAGER

import argparse
import os
import sys
from subprocess import check_output

import generate_api

Expand Down Expand Up @@ -93,7 +95,27 @@ def generate(artman_yaml):
generate('gapic/google/compute/artman_compute.yaml')


def verify_protoc_version():
protobuf_version_node = check_output(
['grep', '-zohr', '--include=pom.xml',
'<protobuf.version>.*</protobuf.version>'])
version_start_index = protobuf_version_node.find('>') + 1
version_end_index = protobuf_version_node.rfind('<')
protobuf_version = protobuf_version_node[version_start_index : version_end_index].strip()

# This will be something like 'libprotoc 3.6.0'
protoc_version_str = check_output(['protoc', '--version'])

if not (protobuf_version in protoc_version_str):
sys.exit("ERROR: Local version of protoc is %s"
" (see output of `which protoc`)."
" Please use protoc version %s"
" to match the version of protobuf-java used in this repo."
% (protoc_version_str, protobuf_version))


def main():
verify_protoc_version()
# TODO Make the docker image the default, add --local option
parser = argparse.ArgumentParser(description='Batch generate all APIs.')
parser.add_argument('googleapis', help='The path to the googleapis repo')
Expand Down