Configure name overrides for proto pkg dependencies (#248)

2017-02-03 14:21:39 -08:00 · 2017-02-03 14:21:39 -08:00 · 8fa648f184
parent 5d67ad9b6c
commit 8fa648f184
17 changed files with 28 additions and 17 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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
--- 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
--- 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
--- 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'