Merge branch 'master' of https://www.github.com/googleapis/googleapis

.gitignore

@@ -2,3 +2,4 @@ OWNERS
 README.google
 google/internal
 google/protobuf
+.project

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;
 

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) {

google/logging/v2/logging_gapic.yaml

@@ -1,9 +1,10 @@
 type: com.google.api.codegen.ConfigProto
+generate_samples: true
 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:
@@ -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,22 +41,21 @@ 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:
@@ -63,27 +63,25 @@ interfaces:
         - sink_name
     required_fields:
     - 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
+    - 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:
@@ -93,12 +91,11 @@ interfaces:
     required_fields:
     - 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:
@@ -106,12 +103,11 @@ interfaces:
         - sink_name
     required_fields:
     - 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,22 +135,21 @@ 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:
@@ -162,27 +157,25 @@ interfaces:
         - metric_name
     required_fields:
     - 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
+    - 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:
@@ -192,12 +185,11 @@ interfaces:
     required_fields:
     - 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:
@@ -205,12 +197,11 @@ interfaces:
         - metric_name
     required_fields:
     - 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
@@ -249,12 +240,11 @@ interfaces:
         - log_name
     required_fields:
     - 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:
@@ -265,12 +255,11 @@ interfaces:
         - entries
     required_fields:
     - 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:
@@ -280,6 +269,7 @@ interfaces:
         - order_by
     required_fields:
     - 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

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) {

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: