From 0487f764436a78a33fe828ed57d5b70ace47a030 Mon Sep 17 00:00:00 2001 From: michaelbausor Date: Thu, 9 Jun 2016 16:48:09 -0700 Subject: [PATCH 1/2] Update logging gapic yaml after proto changes (#46) --- google/logging/v2/logging_gapic.yaml | 102 ++++++++++++--------------- 1 file changed, 45 insertions(+), 57 deletions(-) diff --git a/google/logging/v2/logging_gapic.yaml b/google/logging/v2/logging_gapic.yaml index 2ff6105ea..762e32924 100644 --- a/google/logging/v2/logging_gapic.yaml +++ b/google/logging/v2/logging_gapic.yaml @@ -1,4 +1,5 @@ type: com.google.api.codegen.ConfigProto +generate_samples: true language_settings: java: package_name: com.google.cloud.logging.spi.v2 @@ -25,7 +26,7 @@ interfaces: - UNAVAILABLE - DEADLINE_EXCEEDED - name: non_idempotent - retry_codes: + retry_codes: [] retry_params_def: - name: default initial_retry_delay_millis: 100 @@ -40,50 +41,47 @@ interfaces: flattening: groups: - parameters: - - project_name + - parent required_fields: - - project_name + - parent + request_object_method: true page_streaming: request: - page_size_field: page_size token_field: page_token + page_size_field: page_size response: token_field: next_page_token resources_field: sinks retry_codes_name: idempotent retry_params_name: default - request_object_method: true field_name_patterns: - project_name: project - + parent: project - name: GetSink flattening: groups: - parameters: - sink_name required_fields: - - sink_name + - sink_name + request_object_method: false retry_codes_name: idempotent retry_params_name: default - request_object_method: false field_name_patterns: sink_name: sink - - name: CreateSink flattening: groups: - parameters: - - project_name + - parent - sink required_fields: - - project_name - - sink + - parent + - sink + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - request_object_method: true field_name_patterns: - project_name: project - + parent: project - name: UpdateSink flattening: groups: @@ -91,27 +89,25 @@ interfaces: - sink_name - sink required_fields: - - sink_name - - sink + - sink_name + - sink + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - request_object_method: true field_name_patterns: sink_name: sink - - name: DeleteSink flattening: groups: - parameters: - sink_name required_fields: - - sink_name + - sink_name + request_object_method: false 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} @@ -124,7 +120,7 @@ interfaces: - UNAVAILABLE - DEADLINE_EXCEEDED - name: non_idempotent - retry_codes: + retry_codes: [] retry_params_def: - name: default initial_retry_delay_millis: 100 @@ -139,50 +135,47 @@ interfaces: flattening: groups: - parameters: - - project_name + - parent required_fields: - - project_name + - parent + request_object_method: true page_streaming: request: - page_size_field: page_size token_field: page_token + page_size_field: page_size response: token_field: next_page_token resources_field: metrics retry_codes_name: idempotent retry_params_name: default - request_object_method: true field_name_patterns: - project_name: project - + parent: project - name: GetLogMetric flattening: groups: - parameters: - metric_name required_fields: - - metric_name + - metric_name + request_object_method: false retry_codes_name: idempotent retry_params_name: default - request_object_method: false field_name_patterns: metric_name: metric - - name: CreateLogMetric flattening: groups: - parameters: - - project_name + - parent - metric required_fields: - - project_name - - metric + - parent + - metric + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - request_object_method: true field_name_patterns: - project_name: project - + parent: project - name: UpdateLogMetric flattening: groups: @@ -190,27 +183,25 @@ interfaces: - metric_name - metric required_fields: - - metric_name - - metric + - metric_name + - metric + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - request_object_method: true field_name_patterns: metric_name: metric - - name: DeleteLogMetric flattening: groups: - parameters: - metric_name required_fields: - - metric_name + - metric_name + request_object_method: false 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} @@ -223,7 +214,7 @@ interfaces: - UNAVAILABLE - DEADLINE_EXCEEDED - name: non_idempotent - retry_codes: + retry_codes: [] retry_params_def: - name: default initial_retry_delay_millis: 100 @@ -248,13 +239,12 @@ interfaces: - parameters: - log_name required_fields: - - log_name + - log_name + request_object_method: false retry_codes_name: idempotent retry_params_name: default - request_object_method: false field_name_patterns: log_name: log - - name: WriteLogEntries flattening: groups: @@ -264,13 +254,12 @@ interfaces: - labels - entries required_fields: - - entries + - entries + request_object_method: true retry_codes_name: non_idempotent retry_params_name: default - request_object_method: true field_name_patterns: log_name: log - - name: ListLogEntries flattening: groups: @@ -279,7 +268,8 @@ interfaces: - filter - order_by required_fields: - - project_ids + - project_ids + request_object_method: true page_streaming: request: page_size_field: page_size @@ -289,9 +279,8 @@ interfaces: resources_field: entries retry_codes_name: idempotent retry_params_name: list - request_object_method: true - - name: ListMonitoredResourceDescriptors + request_object_method: false page_streaming: request: page_size_field: page_size @@ -301,4 +290,3 @@ interfaces: resources_field: resource_descriptors retry_codes_name: idempotent retry_params_name: default - request_object_method: true From 996ca3e05b7f723bdd1f244f238292417340d6d7 Mon Sep 17 00:00:00 2001 From: "Brian J. Watson" Date: Mon, 20 Jun 2016 11:17:18 -0700 Subject: [PATCH 2/2] Python release fixes (#47) * Use the correct Python package name for publishing packages * Fix documentation bug * Add service-level documentation, because Sphinx depends on a class docstring in the generated Python code. It generates a blank page otherwise. * Ignore Eclipse files --- .gitignore | 1 + google/logging/v2/log_entry.proto | 2 +- google/logging/v2/logging_config.proto | 2 ++ google/logging/v2/logging_gapic.yaml | 2 +- google/logging/v2/logging_metrics.proto | 1 + google/pubsub/v1/pubsub_gapic.yaml | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 65267c8e5..a5e93821a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ OWNERS README.google google/internal google/protobuf +.project diff --git a/google/logging/v2/log_entry.proto b/google/logging/v2/log_entry.proto index f7575ec03..dd472fedc 100644 --- a/google/logging/v2/log_entry.proto +++ b/google/logging/v2/log_entry.proto @@ -104,7 +104,7 @@ message LogEntryOperation { // Required. An arbitrary producer identifier. The combination of // `id` and `producer` must be globally unique. Examples for `producer`: - // `"MyDivision.MyBigCompany.com"`, "github.com/MyProject/MyApplication"`. + // `"MyDivision.MyBigCompany.com"`, `"github.com/MyProject/MyApplication"`. // string producer = 2; diff --git a/google/logging/v2/logging_config.proto b/google/logging/v2/logging_config.proto index ef5b58110..1f0f24a2b 100644 --- a/google/logging/v2/logging_config.proto +++ b/google/logging/v2/logging_config.proto @@ -25,6 +25,8 @@ option java_outer_classname = "LoggingConfig"; option java_package = "com.google.logging.v2"; +// Service for configuring sinks used to export log entries outside Stackdriver +// Logging. service ConfigServiceV2 { // Lists sinks. rpc ListSinks(ListSinksRequest) returns (ListSinksResponse) { diff --git a/google/logging/v2/logging_gapic.yaml b/google/logging/v2/logging_gapic.yaml index 762e32924..9cee2aa48 100644 --- a/google/logging/v2/logging_gapic.yaml +++ b/google/logging/v2/logging_gapic.yaml @@ -4,7 +4,7 @@ language_settings: java: package_name: com.google.cloud.logging.spi.v2 python: - package_name: gcloud.logging + package_name: google.logging.v2 go: package_name: google.golang.org/cloud/logging csharp: diff --git a/google/logging/v2/logging_metrics.proto b/google/logging/v2/logging_metrics.proto index f03eb2f51..2a5f833a5 100644 --- a/google/logging/v2/logging_metrics.proto +++ b/google/logging/v2/logging_metrics.proto @@ -23,6 +23,7 @@ option java_multiple_files = true; option java_package = "com.google.logging.v2"; +// Service for configuring logs-based metrics. service MetricsServiceV2 { // Lists logs-based metrics. rpc ListLogMetrics(ListLogMetricsRequest) returns (ListLogMetricsResponse) { diff --git a/google/pubsub/v1/pubsub_gapic.yaml b/google/pubsub/v1/pubsub_gapic.yaml index 2084d4dac..ad25a038e 100644 --- a/google/pubsub/v1/pubsub_gapic.yaml +++ b/google/pubsub/v1/pubsub_gapic.yaml @@ -4,7 +4,7 @@ language_settings: java: package_name: com.google.cloud.pubsub.spi.v1 python: - package_name: gcloud.pubsub + package_name: google.pubsub.v1 go: package_name: google.golang.org/cloud/pubsub csharp: