From 237b593750cbcedd775d0cbb3f47b95659672aa2 Mon Sep 17 00:00:00 2001 From: Ernest Landrito Date: Mon, 21 Aug 2017 14:10:38 -0700 Subject: [PATCH] Python: Change package paths (#428) --- gapic/api/artman_dlp.yaml | 6 ++++-- google/bigtable/v2/bigtable_gapic.yaml | 2 +- google/cloud/functions/v1beta2/functions_gapic.yaml | 2 +- google/cloud/language/v1/language_gapic.yaml | 2 +- google/cloud/language/v1beta1/language_gapic.yaml | 2 +- google/cloud/language/v1beta2/language_gapic.yaml | 2 +- google/cloud/speech/v1/cloud_speech_gapic.yaml | 2 +- google/cloud/speech/v1beta1/cloud_speech_gapic.yaml | 2 +- .../videointelligence/v1beta1/videointelligence_gapic.yaml | 2 +- google/cloud/vision/v1/vision_gapic.yaml | 2 +- google/datastore/v1/datastore_gapic.yaml | 2 +- google/devtools/clouddebugger/v2/clouddebugger_gapic.yaml | 2 +- .../clouderrorreporting/v1beta1/errorreporting_gapic.yaml | 2 +- google/devtools/cloudtrace/v1/trace_gapic.yaml | 2 +- google/iam/admin/v1/iam_gapic.yaml | 2 +- google/iam/v1/iam_gapic.yaml | 2 +- google/logging/v2/logging_gapic.yaml | 2 +- google/monitoring/v3/monitoring_gapic.yaml | 2 +- google/privacy/dlp/v2beta1/dlp_gapic.yaml | 4 ++-- google/pubsub/v1/pubsub_gapic.yaml | 2 +- .../admin/database/v1/spanner_admin_database_gapic.yaml | 2 +- .../admin/instance/v1/spanner_admin_instance_gapic.yaml | 2 +- google/spanner/v1/spanner_gapic.yaml | 2 +- 23 files changed, 27 insertions(+), 25 deletions(-) diff --git a/gapic/api/artman_dlp.yaml b/gapic/api/artman_dlp.yaml index e930c3d604..ba88b8c103 100644 --- a/gapic/api/artman_dlp.yaml +++ b/gapic/api/artman_dlp.yaml @@ -61,8 +61,10 @@ python: src: google/cloud/proto dest: dlp/google/cloud/proto staging: - gapic_subpath: generated/python/gapic-google-cloud-dlp-v2beta1 - grpc_subpath: generated/python/proto-google-cloud-dlp-v2beta1 + paths: + - generated/python/gapic-google-cloud-dlp-v2beta1 + - artifact: grpc + dest: generated/python/proto-google-cloud-dlp-v2beta1 ruby: gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-dlp git_repos: diff --git a/google/bigtable/v2/bigtable_gapic.yaml b/google/bigtable/v2/bigtable_gapic.yaml index f95947e903..2e992c6fe0 100644 --- a/google/bigtable/v2/bigtable_gapic.yaml +++ b/google/bigtable/v2/bigtable_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.bigtable.v2 python: - package_name: google.cloud.gapic.bigtable.v2 + package_name: google.cloud.bigtable_v2.gapic go: package_name: cloud.google.com/go/bigtable/apiv2 csharp: diff --git a/google/cloud/functions/v1beta2/functions_gapic.yaml b/google/cloud/functions/v1beta2/functions_gapic.yaml index b444df12ff..474c891354 100644 --- a/google/cloud/functions/v1beta2/functions_gapic.yaml +++ b/google/cloud/functions/v1beta2/functions_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.functions.v1beta2 python: - package_name: google.cloud.functions.v1beta2 + package_name: google.cloud.functions_v1beta2.gapic go: package_name: cloud.google.com/go/cloud/functions/apiv1beta2 csharp: diff --git a/google/cloud/language/v1/language_gapic.yaml b/google/cloud/language/v1/language_gapic.yaml index a9c1a13ce9..d520e99818 100644 --- a/google/cloud/language/v1/language_gapic.yaml +++ b/google/cloud/language/v1/language_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.language.v1 python: - package_name: google.cloud.gapic.language.v1 + package_name: google.cloud.language_v1.gapic go: package_name: cloud.google.com/go/language/apiv1 csharp: diff --git a/google/cloud/language/v1beta1/language_gapic.yaml b/google/cloud/language/v1beta1/language_gapic.yaml index a352099a12..c3991823c2 100644 --- a/google/cloud/language/v1beta1/language_gapic.yaml +++ b/google/cloud/language/v1beta1/language_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.language.v1beta1 python: - package_name: google.cloud.gapic.language.v1beta1 + package_name: google.cloud.language_v1beta1.gapic go: package_name: cloud.google.com/go/language/apiv1beta1 csharp: diff --git a/google/cloud/language/v1beta2/language_gapic.yaml b/google/cloud/language/v1beta2/language_gapic.yaml index 996cdbe960..5dfdc173e2 100644 --- a/google/cloud/language/v1beta2/language_gapic.yaml +++ b/google/cloud/language/v1beta2/language_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.language.v1beta2 python: - package_name: google.cloud.gapic.language.v1beta2 + package_name: google.cloud.language_v1beta2.gapic go: package_name: cloud.google.com/go/language/apiv1beta2 csharp: diff --git a/google/cloud/speech/v1/cloud_speech_gapic.yaml b/google/cloud/speech/v1/cloud_speech_gapic.yaml index 6c6e0ab547..d964bfd755 100644 --- a/google/cloud/speech/v1/cloud_speech_gapic.yaml +++ b/google/cloud/speech/v1/cloud_speech_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.speech.v1 python: - package_name: google.cloud.gapic.speech.v1 + package_name: google.cloud.speech_v1.gapic go: package_name: cloud.google.com/go/speech/apiv1 csharp: diff --git a/google/cloud/speech/v1beta1/cloud_speech_gapic.yaml b/google/cloud/speech/v1beta1/cloud_speech_gapic.yaml index 88b3752376..3b43774fb5 100644 --- a/google/cloud/speech/v1beta1/cloud_speech_gapic.yaml +++ b/google/cloud/speech/v1beta1/cloud_speech_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.speech.v1beta1 python: - package_name: google.cloud.gapic.speech.v1beta1 + package_name: google.cloud.speech_v1beta1.gapic go: package_name: cloud.google.com/go/speech/apiv1beta1 csharp: diff --git a/google/cloud/videointelligence/v1beta1/videointelligence_gapic.yaml b/google/cloud/videointelligence/v1beta1/videointelligence_gapic.yaml index b62add6bb3..200dbb95fb 100644 --- a/google/cloud/videointelligence/v1beta1/videointelligence_gapic.yaml +++ b/google/cloud/videointelligence/v1beta1/videointelligence_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.videointelligence.v1beta1 python: - package_name: google.cloud.gapic.videointelligence.v1beta1 + package_name: google.cloud.videointelligence_v1beta1.gapic go: package_name: cloud.google.com/go/videointelligence/apiv1beta1 domain_layer_location: cloud.google.com/go/videointelligence diff --git a/google/cloud/vision/v1/vision_gapic.yaml b/google/cloud/vision/v1/vision_gapic.yaml index e8467816b3..02590e13f0 100644 --- a/google/cloud/vision/v1/vision_gapic.yaml +++ b/google/cloud/vision/v1/vision_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.vision.v1 python: - package_name: google.cloud.gapic.vision.v1 + package_name: google.cloud.vision_v1.gapic go: package_name: cloud.google.com/go/vision/apiv1 domain_layer_location: cloud.google.com/go/vision diff --git a/google/datastore/v1/datastore_gapic.yaml b/google/datastore/v1/datastore_gapic.yaml index 7463144c25..7da1b4ae81 100644 --- a/google/datastore/v1/datastore_gapic.yaml +++ b/google/datastore/v1/datastore_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.datastore.v1 python: - package_name: google.cloud.gapic.datastore.v1 + package_name: google.cloud.datastore_v1.gapic go: package_name: cloud.google.com/go/datastore/apiv1 csharp: diff --git a/google/devtools/clouddebugger/v2/clouddebugger_gapic.yaml b/google/devtools/clouddebugger/v2/clouddebugger_gapic.yaml index 096a80ba4a..b7d19549ee 100644 --- a/google/devtools/clouddebugger/v2/clouddebugger_gapic.yaml +++ b/google/devtools/clouddebugger/v2/clouddebugger_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.debugger.v2 python: - package_name: google.cloud.gapic.debugger.v2 + package_name: google.cloud.debugger_v2.gapic go: package_name: cloud.google.com/go/debugger/apiv2 domain_layer_location: cloud.google.com/go/cmd/go-cloud-debug-agent diff --git a/google/devtools/clouderrorreporting/v1beta1/errorreporting_gapic.yaml b/google/devtools/clouderrorreporting/v1beta1/errorreporting_gapic.yaml index 39327a4512..9469003491 100644 --- a/google/devtools/clouderrorreporting/v1beta1/errorreporting_gapic.yaml +++ b/google/devtools/clouderrorreporting/v1beta1/errorreporting_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.errorreporting.v1beta1 python: - package_name: google.cloud.gapic.errorreporting.v1beta1 + package_name: google.cloud.errorreporting_v1beta1.gapic go: package_name: cloud.google.com/go/errorreporting/apiv1beta1 csharp: diff --git a/google/devtools/cloudtrace/v1/trace_gapic.yaml b/google/devtools/cloudtrace/v1/trace_gapic.yaml index 2d7bcbb060..abeaafb961 100644 --- a/google/devtools/cloudtrace/v1/trace_gapic.yaml +++ b/google/devtools/cloudtrace/v1/trace_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.trace.v1 python: - package_name: google.cloud.gapic.trace.v1 + package_name: google.cloud.trace_v1.gapic ruby: package_name: Google::Cloud::Trace::V1 php: diff --git a/google/iam/admin/v1/iam_gapic.yaml b/google/iam/admin/v1/iam_gapic.yaml index 4018b5ee7e..2f67f84ebe 100644 --- a/google/iam/admin/v1/iam_gapic.yaml +++ b/google/iam/admin/v1/iam_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.iam.admin.v1 python: - package_name: google.cloud.gapic.iam_admin.v1 + package_name: google.cloud.iam_admin_v1.gapic go: package_name: cloud.google.com/go/iam/admin/apiv1 csharp: diff --git a/google/iam/v1/iam_gapic.yaml b/google/iam/v1/iam_gapic.yaml index 667867df45..11fa58e4f8 100644 --- a/google/iam/v1/iam_gapic.yaml +++ b/google/iam/v1/iam_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.iam.v1 python: - package_name: google.cloud.gapic.iam.v1 + package_name: google.cloud.iam_v1.gapic go: package_name: cloud.google.com/go/iam/apiv1 csharp: diff --git a/google/logging/v2/logging_gapic.yaml b/google/logging/v2/logging_gapic.yaml index 3f272e2d7e..d1c18f580f 100644 --- a/google/logging/v2/logging_gapic.yaml +++ b/google/logging/v2/logging_gapic.yaml @@ -7,7 +7,7 @@ language_settings: google.logging.v2.LoggingServiceV2: Logging google.logging.v2.MetricsServiceV2: Metrics python: - package_name: google.cloud.gapic.logging.v2 + package_name: google.cloud.logging_v2.gapic go: package_name: cloud.google.com/go/logging/apiv2 domain_layer_location: cloud.google.com/go/logging diff --git a/google/monitoring/v3/monitoring_gapic.yaml b/google/monitoring/v3/monitoring_gapic.yaml index 97220d8b16..46c45d2d28 100644 --- a/google/monitoring/v3/monitoring_gapic.yaml +++ b/google/monitoring/v3/monitoring_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.monitoring.v3 python: - package_name: google.cloud.gapic.monitoring.v3 + package_name: google.cloud.monitoring_v3.gapic go: package_name: cloud.google.com/go/monitoring/apiv3 csharp: diff --git a/google/privacy/dlp/v2beta1/dlp_gapic.yaml b/google/privacy/dlp/v2beta1/dlp_gapic.yaml index 0cdd49e8de..921e02fb35 100644 --- a/google/privacy/dlp/v2beta1/dlp_gapic.yaml +++ b/google/privacy/dlp/v2beta1/dlp_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.dlp.v2beta1 python: - package_name: google.cloud.gapic.dlp.v2beta1 + package_name: google.cloud.dlp_v2beta1.gapic go: package_name: cloud.google.com/go/dlp/apiv2beta1 csharp: @@ -138,6 +138,6 @@ resource_name_generation: - message_name: InspectOperationResult field_entity_map: name: result -- message_name: ListInspectFindingsRequest +- message_name: ListInspectFindingsRequest field_entity_map: name: result diff --git a/google/pubsub/v1/pubsub_gapic.yaml b/google/pubsub/v1/pubsub_gapic.yaml index 59ee3101af..659519b95c 100644 --- a/google/pubsub/v1/pubsub_gapic.yaml +++ b/google/pubsub/v1/pubsub_gapic.yaml @@ -6,7 +6,7 @@ language_settings: google.pubsub.v1.Publisher: TopicAdmin google.pubsub.v1.Subscriber: SubscriptionAdmin python: - package_name: google.cloud.gapic.pubsub.v1 + package_name: google.cloud.pubsub_v1.gapic go: package_name: cloud.google.com/go/pubsub/apiv1 domain_layer_location: cloud.google.com/go/pubsub diff --git a/google/spanner/admin/database/v1/spanner_admin_database_gapic.yaml b/google/spanner/admin/database/v1/spanner_admin_database_gapic.yaml index fe2d1169d8..369cc04dcb 100644 --- a/google/spanner/admin/database/v1/spanner_admin_database_gapic.yaml +++ b/google/spanner/admin/database/v1/spanner_admin_database_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.spanner.admin.database.v1 python: - package_name: google.cloud.gapic.spanner_admin_database.v1 + package_name: google.cloud.spanner_admin_database_v1.gapic go: package_name: cloud.google.com/go/spanner/admin/database/apiv1 csharp: diff --git a/google/spanner/admin/instance/v1/spanner_admin_instance_gapic.yaml b/google/spanner/admin/instance/v1/spanner_admin_instance_gapic.yaml index 532bb63543..618a133488 100644 --- a/google/spanner/admin/instance/v1/spanner_admin_instance_gapic.yaml +++ b/google/spanner/admin/instance/v1/spanner_admin_instance_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.spanner.admin.instance.v1 python: - package_name: google.cloud.gapic.spanner_admin_instance.v1 + package_name: google.cloud.spanner_admin_instance_v1.gapic go: package_name: cloud.google.com/go/spanner/admin/instance/apiv1 csharp: diff --git a/google/spanner/v1/spanner_gapic.yaml b/google/spanner/v1/spanner_gapic.yaml index bd09e5a488..59e6914a2b 100644 --- a/google/spanner/v1/spanner_gapic.yaml +++ b/google/spanner/v1/spanner_gapic.yaml @@ -3,7 +3,7 @@ language_settings: java: package_name: com.google.cloud.spanner.v1 python: - package_name: google.cloud.gapic.spanner.v1 + package_name: google.cloud.spanner_v1.gapic go: package_name: cloud.google.com/go/spanner/apiv1 csharp: