From 7f54ebf9fe7825766e450d5c2c7c184e115f6635 Mon Sep 17 00:00:00 2001
From: Google APIs <noreply@google.com>
Date: Tue, 12 Feb 2019 11:25:11 -0800
Subject: [PATCH] Synchronize new proto/yaml changes.

PiperOrigin-RevId: 233644240
---
 google/pubsub/v1/pubsub_gapic.yaml | 46 ++++++++++++++++--------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/google/pubsub/v1/pubsub_gapic.yaml b/google/pubsub/v1/pubsub_gapic.yaml
index ce966247..da411da8 100644
--- a/google/pubsub/v1/pubsub_gapic.yaml
+++ b/google/pubsub/v1/pubsub_gapic.yaml
@@ -69,16 +69,14 @@ interfaces:
   retry_codes_def:
   - name: idempotent
     retry_codes:
+    - UNKNOWN
+    - ABORTED
     - UNAVAILABLE
-    - DEADLINE_EXCEEDED
   - name: non_idempotent
-    retry_codes: []
-  - name: pull
     retry_codes:
-    - DEADLINE_EXCEEDED
-    - INTERNAL
-    - RESOURCE_EXHAUSTED
     - UNAVAILABLE
+  - name: none
+    retry_codes: []
   retry_params_def:
   - name: default
     initial_retry_delay_millis: 100
@@ -140,7 +138,7 @@ interfaces:
     required_fields:
     - subscription
     - update_mask
-    retry_codes_name: idempotent
+    retry_codes_name: non_idempotent
     retry_params_name: default
     timeout_millis: 60000
     sample_code_init_fields:
@@ -174,7 +172,7 @@ interfaces:
     required_fields:
     - subscription
     resource_name_treatment: STATIC_TYPES
-    retry_codes_name: idempotent
+    retry_codes_name: non_idempotent
     retry_params_name: default
     field_name_patterns:
       subscription: subscription
@@ -210,7 +208,7 @@ interfaces:
     - subscription
     - ack_ids
     resource_name_treatment: STATIC_TYPES
-    retry_codes_name: idempotent
+    retry_codes_name: non_idempotent
     retry_params_name: messaging
     field_name_patterns:
       subscription: subscription
@@ -247,7 +245,7 @@ interfaces:
       response:
         resources_field: received_messages
     resource_name_treatment: STATIC_TYPES
-    retry_codes_name: pull
+    retry_codes_name: none
     retry_params_name: streaming_messaging
     field_name_patterns:
       subscription: subscription
@@ -301,7 +299,7 @@ interfaces:
     - name
     - subscription
     resource_name_treatment: STATIC_TYPES
-    retry_codes_name: idempotent
+    retry_codes_name: non_idempotent
     retry_params_name: default
     field_name_patterns:
       name: snapshot
@@ -311,7 +309,7 @@ interfaces:
     required_fields:
     - snapshot
     - update_mask
-    retry_codes_name: idempotent
+    retry_codes_name: non_idempotent
     retry_params_name: default
     timeout_millis: 60000
     sample_code_init_fields:
@@ -325,7 +323,7 @@ interfaces:
     required_fields:
     - snapshot
     resource_name_treatment: STATIC_TYPES
-    retry_codes_name: idempotent
+    retry_codes_name: non_idempotent
     retry_params_name: default
     field_name_patterns:
       snapshot: snapshot
@@ -336,7 +334,7 @@ interfaces:
     required_fields:
     - subscription
     resource_name_treatment: STATIC_TYPES
-    retry_codes_name: non_idempotent
+    retry_codes_name: idempotent
     retry_params_name: default
     field_name_patterns:
       subscription: subscription
@@ -406,9 +404,15 @@ interfaces:
   retry_codes_def:
   - name: idempotent
     retry_codes:
+    - UNKNOWN
+    - ABORTED
     - UNAVAILABLE
-    - DEADLINE_EXCEEDED
-  - name: one_plus_delivery
+  - name: non_idempotent
+    retry_codes:
+    - UNAVAILABLE
+  - name: none
+    retry_codes: []
+  - name: publish
     retry_codes:
     - ABORTED
     - CANCELLED
@@ -417,8 +421,6 @@ interfaces:
     - UNKNOWN
     - UNAVAILABLE
     - DEADLINE_EXCEEDED
-  - name: non_idempotent
-    retry_codes: []
   retry_params_def:
   - name: default
     initial_retry_delay_millis: 100
@@ -445,7 +447,7 @@ interfaces:
     required_fields:
     - name
     resource_name_treatment: STATIC_TYPES
-    retry_codes_name: idempotent
+    retry_codes_name: non_idempotent
     retry_params_name: default
     field_name_patterns:
       name: topic
@@ -454,7 +456,7 @@ interfaces:
     required_fields:
     - topic
     - update_mask
-    retry_codes_name: idempotent
+    retry_codes_name: non_idempotent
     retry_params_name: default
     timeout_millis: 60000
   - name: Publish
@@ -467,7 +469,7 @@ interfaces:
     - topic
     - messages
     resource_name_treatment: STATIC_TYPES
-    retry_codes_name: one_plus_delivery
+    retry_codes_name: publish
     retry_params_name: messaging
     batching:
       thresholds:
@@ -551,7 +553,7 @@ interfaces:
     required_fields:
     - topic
     resource_name_treatment: STATIC_TYPES
-    retry_codes_name: idempotent
+    retry_codes_name: non_idempotent
     retry_params_name: default
     field_name_patterns:
       topic: topic