[CHANGE ME] Re-generated pubsub to pick up changes in the API or clie…

…nt library generator.
googleapis · Feb 20, 2019 · ef2b394 · ef2b394
1 parent 1d762a1
commit ef2b394
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/pubsub/google/cloud/pubsub_v1/gapic/publisher_client_config.py b/pubsub/google/cloud/pubsub_v1/gapic/publisher_client_config.py
@@ -2,9 +2,10 @@
     "interfaces": {
         "google.pubsub.v1.Publisher": {
             "retry_codes": {
-                "idempotent": ["DEADLINE_EXCEEDED", "UNAVAILABLE"],
-                "non_idempotent": [],
-                "one_plus_delivery": [
+                "idempotent": ["ABORTED", "UNAVAILABLE", "UNKNOWN"],
+                "non_idempotent": ["UNAVAILABLE"],
+                "none": [],
+                "publish": [
                     "ABORTED",
                     "CANCELLED",
                     "DEADLINE_EXCEEDED",
@@ -37,17 +38,17 @@
             "methods": {
                 "CreateTopic": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "idempotent",
+                    "retry_codes_name": "non_idempotent",
                     "retry_params_name": "default",
                 },
                 "UpdateTopic": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "idempotent",
+                    "retry_codes_name": "non_idempotent",
                     "retry_params_name": "default",
                 },
                 "Publish": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "one_plus_delivery",
+                    "retry_codes_name": "publish",
                     "retry_params_name": "messaging",
                     "bundling": {
                         "element_count_threshold": 10,
@@ -74,7 +75,7 @@
                 },
                 "DeleteTopic": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "idempotent",
+                    "retry_codes_name": "non_idempotent",
                     "retry_params_name": "default",
                 },
                 "SetIamPolicy": {

diff --git a/pubsub/google/cloud/pubsub_v1/gapic/subscriber_client_config.py b/pubsub/google/cloud/pubsub_v1/gapic/subscriber_client_config.py
@@ -2,14 +2,9 @@
     "interfaces": {
         "google.pubsub.v1.Subscriber": {
             "retry_codes": {
-                "idempotent": ["DEADLINE_EXCEEDED", "UNAVAILABLE"],
-                "pull": [
-                    "DEADLINE_EXCEEDED",
-                    "INTERNAL",
-                    "RESOURCE_EXHAUSTED",
-                    "UNAVAILABLE",
-                ],
-                "non_idempotent": [],
+                "idempotent": ["ABORTED", "UNAVAILABLE", "UNKNOWN"],
+                "non_idempotent": ["UNAVAILABLE"],
+                "none": [],
             },
             "retry_params": {
                 "default": {
@@ -53,7 +48,7 @@
                 },
                 "UpdateSubscription": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "idempotent",
+                    "retry_codes_name": "non_idempotent",
                     "retry_params_name": "default",
                 },
                 "ListSubscriptions": {
@@ -63,7 +58,7 @@
                 },
                 "DeleteSubscription": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "idempotent",
+                    "retry_codes_name": "non_idempotent",
                     "retry_params_name": "default",
                 },
                 "ModifyAckDeadline": {
@@ -73,17 +68,17 @@
                 },
                 "Acknowledge": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "idempotent",
+                    "retry_codes_name": "non_idempotent",
                     "retry_params_name": "messaging",
                 },
                 "Pull": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "pull",
+                    "retry_codes_name": "idempotent",
                     "retry_params_name": "messaging",
                 },
                 "StreamingPull": {
                     "timeout_millis": 900000,
-                    "retry_codes_name": "pull",
+                    "retry_codes_name": "none",
                     "retry_params_name": "streaming_messaging",
                 },
                 "ModifyPushConfig": {
@@ -98,22 +93,22 @@
                 },
                 "CreateSnapshot": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "idempotent",
+                    "retry_codes_name": "non_idempotent",
                     "retry_params_name": "default",
                 },
                 "UpdateSnapshot": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "idempotent",
+                    "retry_codes_name": "non_idempotent",
                     "retry_params_name": "default",
                 },
                 "DeleteSnapshot": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "idempotent",
+                    "retry_codes_name": "non_idempotent",
                     "retry_params_name": "default",
                 },
                 "Seek": {
                     "timeout_millis": 60000,
-                    "retry_codes_name": "non_idempotent",
+                    "retry_codes_name": "idempotent",
                     "retry_params_name": "default",
                 },
                 "SetIamPolicy": {

diff --git a/pubsub/noxfile.py b/pubsub/noxfile.py
@@ -45,6 +45,10 @@ def blacken(session):
     """Run black.
 
     Format code to uniform standard.
+    
+    This currently uses Python 3.6 due to the automated Kokoro run of synthtool.
+    That run uses an image that doesn't have 3.6 installed. Before updating this
+    check the state of the `gcp_ubuntu_config` we use for that Kokoro run.
     """
     session.install("black")
     session.run(

diff --git a/pubsub/synth.metadata b/pubsub/synth.metadata
@@ -1,19 +1,19 @@
 {
-  "updateTime": "2019-02-01T01:07:16.579788Z",
+  "updateTime": "2019-02-20T18:12:27.377999Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.16.7",
-        "dockerImage": "googleapis/artman@sha256:d6c8ced606eb49973ca95d2af7c55a681acc042db0f87d135968349e7bf6dd80"
+        "version": "0.16.13",
+        "dockerImage": "googleapis/artman@sha256:5fd9aee1d82a00cebf425c8fa431f5457539562f5867ad9c54370f0ec9a7ccaa"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "acb5253cd11cd43cab93eb153d6e48ba0fa5303d",
-        "internalRef": "231786007"
+        "sha": "18ab81eec27942a942622d5a8d9c9e7a202e8c16",
+        "internalRef": "234814197"
       }
     },
     {