Merge branch 'googleapis:main' into main

googleapis · Jan 24, 2023 · d0d2862 · d0d2862
2 parents ab2b561 + c731318
commit d0d2862
Show file tree

Hide file tree

Showing 83 changed files with 12,645 additions and 3,724 deletions.
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-nodejs:latest
-  digest: sha256:ddb19a6df6c1fa081bc99fb29658f306dd64668bc26f75d1353b28296f3a78e6
-# created: 2022-06-07T21:18:30.024751809Z
+  digest: sha256:fe04ae044dadf5ad88d979dbcc85e0e99372fb5d6316790341e6aca5e4e3fbc8
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,3 +5,5 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few
 - [ ] Appropriate docs were updated (if necessary)
 
 Fixes #<issue_number_goes_here> 🦕
+
+Note: If you are opening a pull request against a `legacy` branch, PLEASE BE AWARE that we generally won't accept these except for things like important security fixes, and only for a limited time.
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -1,2 +1,6 @@
 handleGHRelease: true
 releaseType: node
+branches:
+- branch: legacy-v2
+  releaseType: node
+  handleGHRelease: true
diff --git a/.jsdoc.js b/.jsdoc.js
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ module.exports = {
     includePattern: '\\.js$'
   },
   templates: {
-    copyright: 'Copyright 2022 Google LLC',
+    copyright: 'Copyright 2023 Google LLC',
     includeDate: false,
     sourceFiles: false,
     systemName: '@google-cloud/pubsub',

diff --git a/.kokoro/continuous/node12/samples-test.cfg b/.kokoro/continuous/node12/samples-test.cfg
diff --git a/.kokoro/continuous/node12/system-test.cfg b/.kokoro/continuous/node12/system-test.cfg
diff --git a/.kokoro/presubmit/node12/samples-test.cfg b/.kokoro/presubmit/node12/samples-test.cfg
diff --git a/.kokoro/presubmit/node12/system-test.cfg b/.kokoro/presubmit/node12/system-test.cfg
diff --git a/.kokoro/publish.sh b/.kokoro/publish.sh
diff --git a/.kokoro/release/docs.sh b/.kokoro/release/docs.sh
diff --git a/.kokoro/samples-test.sh b/.kokoro/samples-test.sh
diff --git a/.kokoro/system-test.sh b/.kokoro/system-test.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,64 @@
 
 [1]: https://www.npmjs.com/package/@google-cloud/pubsub?activeTab=versions
 
+## [3.3.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.2.1...v3.3.0) (2023-01-23)
+
+
+### Features
+
+* Add schema evolution methods and fields ([#1672](https://github.com/googleapis/nodejs-pubsub/issues/1672)) ([7a5bc29](https://github.com/googleapis/nodejs-pubsub/commit/7a5bc29e8a39e5c1991a5eae4200a5045f21997d))
+
+
+### Bug Fixes
+
+* Remove redundant .then() ([#1671](https://github.com/googleapis/nodejs-pubsub/issues/1671)) ([108edc3](https://github.com/googleapis/nodejs-pubsub/commit/108edc3cd2d3d512e2a9777a68541dae1f6aba23))
+
+## [3.2.1](https://github.com/googleapis/nodejs-pubsub/compare/v3.2.0...v3.2.1) (2022-11-04)
+
+
+### Bug Fixes
+
+* **deps:** Use google-gax v3.5.2 ([#1652](https://github.com/googleapis/nodejs-pubsub/issues/1652)) ([ee308b5](https://github.com/googleapis/nodejs-pubsub/commit/ee308b596802ad5537a89804a95429d630595eb4))
+
+## [3.2.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.1.1...v3.2.0) (2022-09-22)
+
+
+### Features
+
+* Add support for exactly once subscriptions ([#1572](https://github.com/googleapis/nodejs-pubsub/issues/1572)) ([998de35](https://github.com/googleapis/nodejs-pubsub/commit/998de35d4bffde4fcffd217347307c04031df3e2))
+
+
+### Bug Fixes
+
+* Preserve default values in x-goog-request-params header ([#1622](https://github.com/googleapis/nodejs-pubsub/issues/1622)) ([76c0ab5](https://github.com/googleapis/nodejs-pubsub/commit/76c0ab55ecfcf0cee5fad1314ecf2317d471c13a))
+* Wait for 'drain' as well ([#1636](https://github.com/googleapis/nodejs-pubsub/issues/1636)) ([d72db50](https://github.com/googleapis/nodejs-pubsub/commit/d72db503bfa3b9b6d7481ce44eb161a031f76715))
+
+## [3.1.1](https://github.com/googleapis/nodejs-pubsub/compare/v3.1.0...v3.1.1) (2022-09-01)
+
+
+### Bug Fixes
+
+* Add hashes to requirements.txt ([#1544](https://github.com/googleapis/nodejs-pubsub/issues/1544)) ([#1614](https://github.com/googleapis/nodejs-pubsub/issues/1614)) ([359d098](https://github.com/googleapis/nodejs-pubsub/commit/359d098b60422b37230024128ed10f04018670a0))
+* Allow passing gax instance to client constructor ([#1617](https://github.com/googleapis/nodejs-pubsub/issues/1617)) ([8eabe38](https://github.com/googleapis/nodejs-pubsub/commit/8eabe3802bbc50309f3d6a0b9997752ab7f367e1))
+* Better support for fallback mode ([#1610](https://github.com/googleapis/nodejs-pubsub/issues/1610)) ([d9e7311](https://github.com/googleapis/nodejs-pubsub/commit/d9e7311d6f6bb78bb3f06454a7ce3cf02fff314c))
+* Change import long to require ([#1611](https://github.com/googleapis/nodejs-pubsub/issues/1611)) ([5553af2](https://github.com/googleapis/nodejs-pubsub/commit/5553af2684ba87ed361d9d79bf2e2a6d7cd3763c))
+* **deps:** Update dependency protobufjs to v7 ([#1602](https://github.com/googleapis/nodejs-pubsub/issues/1602)) ([6e0ec60](https://github.com/googleapis/nodejs-pubsub/commit/6e0ec60a8f6efc7d8e7b67c431dddd7073895ae6))
+* Do not import the whole google-gax from proto JS ([#1553](https://github.com/googleapis/nodejs-pubsub/issues/1553)) ([#1616](https://github.com/googleapis/nodejs-pubsub/issues/1616)) ([31c7fa2](https://github.com/googleapis/nodejs-pubsub/commit/31c7fa234ca3d0455979065199d0da1599ed216b))
+
+## [3.1.0](https://github.com/googleapis/nodejs-pubsub/compare/v3.0.3...v3.1.0) (2022-07-15)
+
+
+### Features
+
+* add minExtension setting and plug it into EOS and ackDeadline settings ([#1582](https://github.com/googleapis/nodejs-pubsub/issues/1582)) ([8709979](https://github.com/googleapis/nodejs-pubsub/commit/87099799960b9f299d3fad609c48bd13e03c9097))
+
+## [3.0.3](https://github.com/googleapis/nodejs-pubsub/compare/v3.0.2...v3.0.3) (2022-07-08)
+
+
+### Bug Fixes
+
+* pin @opentelemetry/semantic-conventions for Node 12 support ([#1596](https://github.com/googleapis/nodejs-pubsub/issues/1596)) ([f594061](https://github.com/googleapis/nodejs-pubsub/commit/f5940613f53c3647ab9941adfd8442f2bc0bb857))
+
 ## [3.0.2](https://github.com/googleapis/nodejs-pubsub/compare/v3.0.1...v3.0.2) (2022-06-30)
 
 

diff --git a/README.md b/README.md
@@ -129,6 +129,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree
 | Create Push Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createPushSubscription.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/createPushSubscription.js,samples/README.md) |
 | Create Subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscription.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/createSubscription.js,samples/README.md) |
 | Create Subscription With Dead Letter Policy | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithDeadLetterPolicy.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/createSubscriptionWithDeadLetterPolicy.js,samples/README.md) |
+| Create an exactly-once delivery subscription | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithExactlyOnceDelivery.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/createSubscriptionWithExactlyOnceDelivery.js,samples/README.md) |
 | Create Subscription With Filtering | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithFiltering.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/createSubscriptionWithFiltering.js,samples/README.md) |
 | Create Subscription with ordering enabled | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createSubscriptionWithOrdering.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/createSubscriptionWithOrdering.js,samples/README.md) |
 | Create Topic | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/createTopic.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/createTopic.js,samples/README.md) |
@@ -148,6 +149,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/nodejs-pubsub/tree
 | Listen For Avro Records | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenForAvroRecords.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/listenForAvroRecords.js,samples/README.md) |
 | Listen For Errors | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenForErrors.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/listenForErrors.js,samples/README.md) |
 | Listen For Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenForMessages.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/listenForMessages.js,samples/README.md) |
+| Listen with exactly-once delivery | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenForMessagesWithExactlyOnceDelivery.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/listenForMessagesWithExactlyOnceDelivery.js,samples/README.md) |
 | Listen For Protobuf Messages | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenForProtobufMessages.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/listenForProtobufMessages.js,samples/README.md) |
 | Listen For Messages With Custom Attributes | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/listenWithCustomAttributes.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/listenWithCustomAttributes.js,samples/README.md) |
 | Modify Push Configuration | [source code](https://github.com/googleapis/nodejs-pubsub/blob/main/samples/modifyPushConfig.js) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/nodejs-pubsub&page=editor&open_in_editor=samples/modifyPushConfig.js,samples/README.md) |

diff --git a/owlbot.py b/owlbot.py
@@ -14,4 +14,24 @@
 
 import synthtool.languages.node as node
 
-node.owlbot_main(templates_excludes=['src/index.ts'])
+# This code snippet can be used to manually update the typeless bot
+# to a different version than OwlBot has baked in, but this shouldn't
+# be needed once it's settled down.
+"""
+import os
+from synthtool import shell
+from synthtool.log import logger
+old_path = os.getcwd()
+os.chdir("/synthtool")
+logger.debug("Update typeless sample bot [1.1.0]")
+shell.run(["npm", "i", "@google-cloud/typeless-sample-bot@1.1.0"])
+os.chdir(old_path)
+"""
+
+node.typeless_samples_hermetic()
+
+node.owlbot_main(templates_excludes=[
+    'src/index.ts',
+    '.github/PULL_REQUEST_TEMPLATE.md',
+    '.github/release-please.yml'
+])
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@google-cloud/pubsub",
   "description": "Cloud Pub/Sub Client Library for Node.js",
-  "version": "3.0.2",
+  "version": "3.3.0",
   "license": "Apache-2.0",
   "author": "Google Inc.",
   "engines": {
@@ -58,46 +58,47 @@
     "arrify": "^2.0.0",
     "extend": "^3.0.2",
     "google-auth-library": "^8.0.2",
-    "google-gax": "^3.0.1",
+    "google-gax": "^3.5.2",
+    "heap-js": "^2.2.0",
     "is-stream-ended": "^0.1.4",
     "lodash.snakecase": "^4.1.1",
     "p-defer": "^3.0.0"
   },
   "devDependencies": {
-    "@grpc/proto-loader": "^0.6.0",
+    "@grpc/proto-loader": "^0.7.0",
     "@opentelemetry/tracing": "^0.24.0",
     "@types/execa": "^0.9.0",
     "@types/extend": "^3.0.0",
     "@types/lodash.snakecase": "^4.1.6",
     "@types/mocha": "^9.0.0",
     "@types/mv": "^2.1.0",
     "@types/ncp": "^2.0.1",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.0.0",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.0",
     "@types/tmp": "^0.2.0",
-    "@types/uuid": "^8.0.0",
+    "@types/uuid": "^9.0.0",
     "c8": "^7.0.0",
     "codecov": "^3.0.0",
     "execa": "^5.0.0",
     "gts": "^3.1.0",
-    "jsdoc": "^3.6.2",
+    "jsdoc": "^4.0.0",
     "jsdoc-fresh": "^2.0.0",
     "jsdoc-region-tag": "^2.0.0",
     "linkinator": "^4.0.0",
     "mocha": "^9.2.2",
     "mv": "^2.1.1",
     "ncp": "^2.0.0",
     "null-loader": "^4.0.0",
-    "protobufjs": "^6.10.1",
+    "protobufjs": "^7.0.0",
     "proxyquire": "^2.0.0",
-    "sinon": "^14.0.0",
+    "sinon": "^15.0.0",
     "tmp": "^0.2.0",
     "ts-loader": "^9.0.0",
     "typescript": "^4.6.4",
-    "uuid": "^8.0.0",
+    "uuid": "^9.0.0",
     "webpack": "^5.0.0",
-    "webpack-cli": "^4.0.0",
+    "webpack-cli": "^5.0.0",
     "yargs": "^16.0.0"
   }
 }
diff --git a/protos/google/pubsub/v1/pubsub.proto b/protos/google/pubsub/v1/pubsub.proto
@@ -157,6 +157,16 @@ message SchemaSettings {
 
   // The encoding of messages validated against `schema`.
   Encoding encoding = 2;
+
+  // The minimum (inclusive) revision allowed for validating messages. If empty
+  // or not present, allow any revision to be validated against last_revision or
+  // any revision created before.
+  string first_revision_id = 3;
+
+  // The maximum (inclusive) revision allowed for validating messages. If empty
+  // or not present, allow any revision to be validated against first_revision
+  // or any revision created after.
+  string last_revision_id = 4;
 }
 
 // A topic resource.
@@ -795,8 +805,8 @@ message Subscription {
   google.protobuf.Duration topic_message_retention_duration = 17
       [(google.api.field_behavior) = OUTPUT_ONLY];
 
-  // Output only. An output-only field indicating whether or not the subscription can receive
-  // messages.
+  // Output only. An output-only field indicating whether or not the
+  // subscription can receive messages.
   State state = 19 [(google.api.field_behavior) = OUTPUT_ONLY];
 }
 
@@ -969,8 +979,8 @@ message BigQueryConfig {
   // subscription's backlog.
   bool drop_unknown_fields = 4;
 
-  // Output only. An output-only field that indicates whether or not the subscription can
-  // receive messages.
+  // Output only. An output-only field that indicates whether or not the
+  // subscription can receive messages.
   State state = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
 }
 
@@ -1252,25 +1262,25 @@ message StreamingPullResponse {
   // previously received message.
   message AcknowledgeConfirmation {
     // Successfully processed acknowledgement IDs.
-    repeated string ack_ids = 1 [ctype = CORD];
+    repeated string ack_ids = 1;
 
     // List of acknowledgement IDs that were malformed or whose acknowledgement
     // deadline has expired.
-    repeated string invalid_ack_ids = 2 [ctype = CORD];
+    repeated string invalid_ack_ids = 2;
 
     // List of acknowledgement IDs that were out of order.
-    repeated string unordered_ack_ids = 3 [ctype = CORD];
+    repeated string unordered_ack_ids = 3;
   }
 
   // Acknowledgement IDs sent in one or more previous requests to modify the
   // deadline for a specific message.
   message ModifyAckDeadlineConfirmation {
     // Successfully processed acknowledgement IDs.
-    repeated string ack_ids = 1 [ctype = CORD];
+    repeated string ack_ids = 1;
 
     // List of acknowledgement IDs that were malformed or whose acknowledgement
     // deadline has expired.
-    repeated string invalid_ack_ids = 2 [ctype = CORD];
+    repeated string invalid_ack_ids = 2;
   }
 
   // Subscription properties sent as part of the response.