From 8fa648f184e19a99ec56a11c4ac85405f719d65a Mon Sep 17 00:00:00 2001 From: Jacob Geiger Date: Fri, 3 Feb 2017 14:21:39 -0800 Subject: [PATCH] Configure name overrides for proto pkg dependencies (#248) --- gapic/api/artman_bigtable.yaml | 2 +- gapic/api/artman_clouddebugger.yaml | 2 +- gapic/api/artman_datastore.yaml | 2 +- gapic/api/artman_errorreporting.yaml | 2 +- gapic/api/artman_functions.yaml | 2 +- gapic/api/artman_genomics.yaml | 2 +- gapic/api/artman_iam.yaml | 2 +- gapic/api/artman_language.yaml | 2 +- gapic/api/artman_logging.yaml | 2 +- gapic/api/artman_longrunning.yaml | 2 +- gapic/api/artman_monitoring.yaml | 2 +- gapic/api/artman_pubsub.yaml | 2 +- gapic/api/artman_speech.yaml | 2 +- gapic/api/artman_trace.yaml | 2 +- gapic/api/artman_vision.yaml | 2 +- gapic/core/artman_iam.yaml | 2 +- gapic/packaging/dependencies.yaml | 13 ++++++++++++- 17 files changed, 28 insertions(+), 17 deletions(-) diff --git a/gapic/api/artman_bigtable.yaml b/gapic/api/artman_bigtable.yaml index 3a5ff1d0..26c23b62 100644 --- a/gapic/api/artman_bigtable.yaml +++ b/gapic/api/artman_bigtable.yaml @@ -2,7 +2,7 @@ common: api_name: bigtable api_version: v2 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/api/artman_clouddebugger.yaml b/gapic/api/artman_clouddebugger.yaml index f31d36ec..e43dcb79 100644 --- a/gapic/api/artman_clouddebugger.yaml +++ b/gapic/api/artman_clouddebugger.yaml @@ -2,7 +2,7 @@ common: api_name: debugger api_version: v2 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/api/artman_datastore.yaml b/gapic/api/artman_datastore.yaml index e73d43b6..aa46b482 100644 --- a/gapic/api/artman_datastore.yaml +++ b/gapic/api/artman_datastore.yaml @@ -2,7 +2,7 @@ common: api_name: datastore api_version: v1 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/api/artman_errorreporting.yaml b/gapic/api/artman_errorreporting.yaml index ce77e9c7..f53b7d29 100644 --- a/gapic/api/artman_errorreporting.yaml +++ b/gapic/api/artman_errorreporting.yaml @@ -2,7 +2,7 @@ common: api_name: error-reporting api_version: v1beta1 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/api/artman_functions.yaml b/gapic/api/artman_functions.yaml index bdf42ec2..77213c07 100644 --- a/gapic/api/artman_functions.yaml +++ b/gapic/api/artman_functions.yaml @@ -2,7 +2,7 @@ common: api_name: functions api_version: v1beta2 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/api/artman_genomics.yaml b/gapic/api/artman_genomics.yaml index dd61068c..9d99cb5d 100644 --- a/gapic/api/artman_genomics.yaml +++ b/gapic/api/artman_genomics.yaml @@ -2,7 +2,7 @@ common: api_name: genomics api_version: v1 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos - google-iam-v1 import_proto_path: diff --git a/gapic/api/artman_iam.yaml b/gapic/api/artman_iam.yaml index f5e0809e..95dd92d3 100644 --- a/gapic/api/artman_iam.yaml +++ b/gapic/api/artman_iam.yaml @@ -2,7 +2,7 @@ common: api_name: iam-admin api_version: v1 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-iam-v1 import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/api/artman_language.yaml b/gapic/api/artman_language.yaml index b11dd38d..73e8d4a7 100644 --- a/gapic/api/artman_language.yaml +++ b/gapic/api/artman_language.yaml @@ -2,7 +2,7 @@ common: api_name: language api_version: v1 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/api/artman_logging.yaml b/gapic/api/artman_logging.yaml index 5e742f62..64c9776f 100644 --- a/gapic/api/artman_logging.yaml +++ b/gapic/api/artman_logging.yaml @@ -2,7 +2,7 @@ common: api_name: logging api_version: v2 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/api/artman_longrunning.yaml b/gapic/api/artman_longrunning.yaml index f78632f0..2337315d 100644 --- a/gapic/api/artman_longrunning.yaml +++ b/gapic/api/artman_longrunning.yaml @@ -2,7 +2,7 @@ common: api_name: longrunning api_version: v1 organization_name: google - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/api/artman_monitoring.yaml b/gapic/api/artman_monitoring.yaml index 001fd292..cced11d3 100644 --- a/gapic/api/artman_monitoring.yaml +++ b/gapic/api/artman_monitoring.yaml @@ -2,7 +2,7 @@ common: api_name: monitoring api_version: v3 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/api/artman_pubsub.yaml b/gapic/api/artman_pubsub.yaml index 8a48fb97..b6a5bc7e 100644 --- a/gapic/api/artman_pubsub.yaml +++ b/gapic/api/artman_pubsub.yaml @@ -2,7 +2,7 @@ common: api_name: pubsub api_version: v1 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos - google-iam-v1 import_proto_path: diff --git a/gapic/api/artman_speech.yaml b/gapic/api/artman_speech.yaml index 138a0e8f..68142860 100644 --- a/gapic/api/artman_speech.yaml +++ b/gapic/api/artman_speech.yaml @@ -2,7 +2,7 @@ common: api_name: speech api_version: v1beta1 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/api/artman_trace.yaml b/gapic/api/artman_trace.yaml index 1e365565..526d4fc9 100644 --- a/gapic/api/artman_trace.yaml +++ b/gapic/api/artman_trace.yaml @@ -2,7 +2,7 @@ common: api_name: trace api_version: v1 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/api/artman_vision.yaml b/gapic/api/artman_vision.yaml index 76e87fc2..650b59a9 100644 --- a/gapic/api/artman_vision.yaml +++ b/gapic/api/artman_vision.yaml @@ -2,7 +2,7 @@ common: api_name: vision api_version: v1 organization_name: google-cloud - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/core/artman_iam.yaml b/gapic/core/artman_iam.yaml index 0f3b935e..2ea5571c 100644 --- a/gapic/core/artman_iam.yaml +++ b/gapic/core/artman_iam.yaml @@ -2,7 +2,7 @@ common: api_name: iam api_version: v1 organization_name: google - proto_gen_pkg_deps: + proto_deps: - google-common-protos import_proto_path: - ${REPOROOT}/googleapis diff --git a/gapic/packaging/dependencies.yaml b/gapic/packaging/dependencies.yaml index d5d14622..b54a7c3b 100644 --- a/gapic/packaging/dependencies.yaml +++ b/gapic/packaging/dependencies.yaml @@ -51,9 +51,20 @@ proto_version: php: lower: '0.7.*' -common_protos_version: +# Dependencies on gRPC/proto packages referenced in the proto_deps +# field of the Artman config. + +google-common-protos_version: python: + name_override: googleapis-common-protos lower: '1.5.0' upper: '2.0dev' nodejs: + name_override: google-proto-files lower: '0.8.6' + +google-iam-v1_version: + python: + name_override: grpc-google-iam-v1 + lower: '0.11.1' + upper: '0.12dev'