From cf05b4e80e0db914f9c4f186b031f6a206193e42 Mon Sep 17 00:00:00 2001 From: Michael Bausor Date: Fri, 6 May 2016 10:27:29 -0700 Subject: [PATCH] Updated gapic yamls with changes to toolkit Updated method_base_name to entity_name Added field_name_patterns --- google/logging/v2/logging_gapic.yaml | 36 ++++++++++++++++++++----- google/pubsub/v1/pubsub_gapic.yaml | 39 ++++++++++++++++++++++++---- 2 files changed, 64 insertions(+), 11 deletions(-) diff --git a/google/logging/v2/logging_gapic.yaml b/google/logging/v2/logging_gapic.yaml index 41a200d9..a5702c95 100644 --- a/google/logging/v2/logging_gapic.yaml +++ b/google/logging/v2/logging_gapic.yaml @@ -16,9 +16,9 @@ interfaces: - name: google.logging.v2.ConfigServiceV2 collections: - name_pattern: projects/{project} - method_base_name: project + entity_name: project - name_pattern: projects/{project}/sinks/{sink} - method_base_name: sink + entity_name: sink retry_codes_def: - name: idempotent retry_codes: @@ -50,6 +50,8 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: true + field_name_patterns: + project_name: project - name: GetSink flattening: @@ -59,6 +61,8 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: false + field_name_patterns: + sink_name: sink - name: CreateSink flattening: @@ -69,6 +73,8 @@ interfaces: retry_codes_name: non_idempotent retry_params_name: default request_object_method: true + field_name_patterns: + project_name: project - name: UpdateSink flattening: @@ -79,6 +85,8 @@ interfaces: retry_codes_name: non_idempotent retry_params_name: default request_object_method: true + field_name_patterns: + sink_name: sink - name: DeleteSink flattening: @@ -88,13 +96,15 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: false + field_name_patterns: + sink_name: sink - name: google.logging.v2.MetricsServiceV2 collections: - name_pattern: projects/{project} - method_base_name: project + entity_name: project - name_pattern: projects/{project}/metrics/{metric} - method_base_name: metric + entity_name: metric retry_codes_def: - name: idempotent retry_codes: @@ -126,6 +136,8 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: true + field_name_patterns: + project_name: project - name: GetLogMetric flattening: @@ -135,6 +147,8 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: false + field_name_patterns: + metric_name: metric - name: CreateLogMetric flattening: @@ -145,6 +159,8 @@ interfaces: retry_codes_name: non_idempotent retry_params_name: default request_object_method: true + field_name_patterns: + project_name: project - name: UpdateLogMetric flattening: @@ -155,6 +171,8 @@ interfaces: retry_codes_name: non_idempotent retry_params_name: default request_object_method: true + field_name_patterns: + metric_name: metric - name: DeleteLogMetric flattening: @@ -164,13 +182,15 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: false + field_name_patterns: + metric_name: metric - name: google.logging.v2.LoggingServiceV2 collections: - name_pattern: projects/{project} - method_base_name: project + entity_name: project - name_pattern: projects/{project}/logs/{log} - method_base_name: log + entity_name: log retry_codes_def: - name: idempotent retry_codes: @@ -204,6 +224,8 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: false + field_name_patterns: + log_name: log - name: WriteLogEntries flattening: @@ -216,6 +238,8 @@ interfaces: retry_codes_name: non_idempotent retry_params_name: default request_object_method: true + field_name_patterns: + log_name: log - name: ListLogEntries flattening: diff --git a/google/pubsub/v1/pubsub_gapic.yaml b/google/pubsub/v1/pubsub_gapic.yaml index 5df8920e..d4ae1085 100644 --- a/google/pubsub/v1/pubsub_gapic.yaml +++ b/google/pubsub/v1/pubsub_gapic.yaml @@ -16,11 +16,11 @@ interfaces: - name: google.pubsub.v1.Subscriber collections: - name_pattern: projects/{project} - method_base_name: project + entity_name: project - name_pattern: projects/{project}/subscriptions/{subscription} - method_base_name: subscription + entity_name: subscription - name_pattern: projects/{project}/topics/{topic} - method_base_name: topic + entity_name: topic retry_codes_def: - name: idempotent retry_codes: @@ -52,6 +52,9 @@ interfaces: retry_codes_name: non_idempotent retry_params_name: default request_object_method: true + field_name_patterns: + name: subscription + topic: topic - name: GetSubscription flattening: groups: @@ -62,6 +65,8 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: false + field_name_patterns: + subscription: subscription - name: ListSubscriptions page_streaming: request: @@ -78,6 +83,8 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: true + field_name_patterns: + project: project - name: DeleteSubscription flattening: groups: @@ -88,6 +95,8 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: false + field_name_patterns: + subscription: subscription - name: ModifyAckDeadline flattening: groups: @@ -102,6 +111,8 @@ interfaces: retry_codes_name: non_idempotent retry_params_name: default request_object_method: true + field_name_patterns: + subscription: subscription - name: Acknowledge flattening: groups: @@ -114,6 +125,8 @@ interfaces: retry_codes_name: non_idempotent retry_params_name: default request_object_method: true + field_name_patterns: + subscription: subscription - name: Pull flattening: groups: @@ -127,6 +140,8 @@ interfaces: retry_codes_name: non_idempotent retry_params_name: default request_object_method: true + field_name_patterns: + subscription: subscription - name: ModifyPushConfig flattening: groups: @@ -139,12 +154,14 @@ interfaces: retry_codes_name: non_idempotent retry_params_name: default request_object_method: true + field_name_patterns: + subscription: subscription - name: google.pubsub.v1.Publisher collections: - name_pattern: projects/{project} - method_base_name: project + entity_name: project - name_pattern: projects/{project}/topics/{topic} - method_base_name: topic + entity_name: topic retry_codes_def: - name: idempotent retry_codes: @@ -172,6 +189,8 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: false + field_name_patterns: + name: topic - name: Publish flattening: groups: @@ -196,6 +215,8 @@ interfaces: discriminator_fields: - topic subresponse_field: message_ids + field_name_patterns: + topic: topic - name: GetTopic flattening: groups: @@ -206,6 +227,8 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: false + field_name_patterns: + topic: topic - name: ListTopics page_streaming: request: @@ -222,6 +245,8 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: true + field_name_patterns: + project: project - name: ListTopicSubscriptions page_streaming: request: @@ -238,6 +263,8 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: true + field_name_patterns: + topic: topic - name: DeleteTopic flattening: groups: @@ -248,3 +275,5 @@ interfaces: retry_codes_name: idempotent retry_params_name: default request_object_method: false + field_name_patterns: + topic: topic